Removed css declarations out of main.scss, so main is only a collector
Fonts, variables and mixins are now all in their own stylesheets
This commit is contained in:
Koen Punt
parent
eb1004f789
commit
755e4a4700
7
app/assets/stylesheets/fonts.scss
Normal file
7
app/assets/stylesheets/fonts.scss
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
@font-face{
|
||||||
|
font-family: Korolev;
|
||||||
|
src: font-url('korolev-medium-compressed.otf');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Typo **/
|
||||||
|
$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;
|
||||||
|
|
@ -5,101 +5,26 @@ $baseLineHeight: 18px !default;
|
||||||
// BOOTSTRAP
|
// BOOTSTRAP
|
||||||
// ------------------
|
// ------------------
|
||||||
@import "bootstrap";
|
@import "bootstrap";
|
||||||
|
@import "bootstrap-responsive";
|
||||||
|
@import "font-awesome";
|
||||||
|
|
||||||
// BOOTSTRAP RESPONSIVE
|
/**
|
||||||
// ------------------
|
* Variables
|
||||||
@import "bootstrap/responsive-utilities";
|
* Contains colors
|
||||||
@import "bootstrap/responsive-1200px-min";
|
*/
|
||||||
|
@import "variables.scss";
|
||||||
|
|
||||||
// FONT AWESOME
|
/**
|
||||||
@import 'font-awesome';
|
* Custom fonts
|
||||||
|
* Contains @font-face font Korolev and default $monotype
|
||||||
|
*/
|
||||||
|
@import "fonts.scss";
|
||||||
|
|
||||||
/** GitLab colors **/
|
/**
|
||||||
$link_color: #3A89A3;
|
* General mixins.
|
||||||
$blue_link: #2FA0BB;
|
* Contains rounded borders, gradients and shades
|
||||||
$style_color: #474D57;
|
*/
|
||||||
$hover: #D9EDF7;
|
@import "mixins.scss";
|
||||||
$hover_border: #ADF;
|
|
||||||
|
|
||||||
/** GitLab Fonts **/
|
|
||||||
@font-face { font-family: Korolev; src: font-url('korolev-medium-compressed.otf'); }
|
|
||||||
$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;
|
|
||||||
|
|
||||||
/** MIXINS **/
|
|
||||||
@mixin shade {
|
|
||||||
-moz-box-shadow: 0 0 3px #ddd;
|
|
||||||
-webkit-box-shadow: 0 0 3px #ddd;
|
|
||||||
box-shadow: 0 0 3px #ddd;
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin solid_shade {
|
|
||||||
-moz-box-shadow: 0 0 0 3px #f1f1f1;
|
|
||||||
-webkit-box-shadow: 0 0 0 3px #f1f1f1;
|
|
||||||
box-shadow: 0 0 0 3px #f1f1f1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin border-radius($radius) {
|
|
||||||
-moz-border-radius: $radius;
|
|
||||||
-webkit-border-radius: $radius;
|
|
||||||
border-radius: $radius;
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin round-borders-bottom($radius) {
|
|
||||||
border-top: 1px solid #eaeaea;
|
|
||||||
-moz-border-radius-bottomright: $radius;
|
|
||||||
-moz-border-radius-bottomleft: $radius;
|
|
||||||
border-bottom-right-radius: $radius;
|
|
||||||
border-bottom-left-radius: $radius;
|
|
||||||
-webkit-border-bottom-left-radius: $radius;
|
|
||||||
-webkit-border-bottom-right-radius: $radius;
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin round-borders-top($radius) {
|
|
||||||
border-top: 1px solid #eaeaea;
|
|
||||||
-moz-border-radius-topright: $radius;
|
|
||||||
-moz-border-radius-topleft: $radius;
|
|
||||||
border-top-right-radius: $radius;
|
|
||||||
border-top-left-radius: $radius;
|
|
||||||
-webkit-border-top-left-radius: $radius;
|
|
||||||
-webkit-border-top-right-radius: $radius;
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin round-borders-all($radius) {
|
|
||||||
border: 1px solid #eaeaea;
|
|
||||||
-moz-border-radius: $radius;
|
|
||||||
-webkit-border-radius: $radius;
|
|
||||||
border-radius: $radius;
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin bg-gradient($from, $to) {
|
|
||||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
|
|
||||||
background-image: -webkit-linear-gradient($from, $to);
|
|
||||||
background-image: -moz-linear-gradient($from, $to);
|
|
||||||
background-image: -o-linear-gradient($from, $to);
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin bg-light-gray-gradient {
|
|
||||||
background:#f1f1f1;
|
|
||||||
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
|
|
||||||
background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
|
|
||||||
background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
|
|
||||||
background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin bg-gray-gradient {
|
|
||||||
background:#eee;
|
|
||||||
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
|
|
||||||
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
|
|
||||||
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
|
|
||||||
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
|
|
||||||
}
|
|
||||||
|
|
||||||
@mixin bg-dark-gray-gradient {
|
|
||||||
background:#eee;
|
|
||||||
background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
|
|
||||||
background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
|
|
||||||
background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Header of application.
|
* Header of application.
|
||||||
|
|
|
||||||
74
app/assets/stylesheets/mixins.scss
Normal file
74
app/assets/stylesheets/mixins.scss
Normal file
|
|
@ -0,0 +1,74 @@
|
||||||
|
@mixin shade {
|
||||||
|
-moz-box-shadow: 0 0 3px #ddd;
|
||||||
|
-webkit-box-shadow: 0 0 3px #ddd;
|
||||||
|
box-shadow: 0 0 3px #ddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin solid_shade {
|
||||||
|
-moz-box-shadow: 0 0 0 3px #f1f1f1;
|
||||||
|
-webkit-box-shadow: 0 0 0 3px #f1f1f1;
|
||||||
|
box-shadow: 0 0 0 3px #f1f1f1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin border-radius($radius) {
|
||||||
|
-moz-border-radius: $radius;
|
||||||
|
-webkit-border-radius: $radius;
|
||||||
|
border-radius: $radius;
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin round-borders-bottom($radius) {
|
||||||
|
border-top: 1px solid #eaeaea;
|
||||||
|
-webkit-border-bottom-left-radius: $radius;
|
||||||
|
-webkit-border-bottom-right-radius: $radius;
|
||||||
|
-moz-border-radius-bottomright: $radius;
|
||||||
|
-moz-border-radius-bottomleft: $radius;
|
||||||
|
border-bottom-right-radius: $radius;
|
||||||
|
border-bottom-left-radius: $radius;
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin round-borders-top($radius) {
|
||||||
|
border-top: 1px solid #eaeaea;
|
||||||
|
-moz-border-radius-topright: $radius;
|
||||||
|
-moz-border-radius-topleft: $radius;
|
||||||
|
border-top-right-radius: $radius;
|
||||||
|
border-top-left-radius: $radius;
|
||||||
|
-webkit-border-top-left-radius: $radius;
|
||||||
|
-webkit-border-top-right-radius: $radius;
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin round-borders-all($radius) {
|
||||||
|
border: 1px solid #eaeaea;
|
||||||
|
-moz-border-radius: $radius;
|
||||||
|
-webkit-border-radius: $radius;
|
||||||
|
border-radius: $radius;
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin bg-gradient($from, $to) {
|
||||||
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
|
||||||
|
background-image: -webkit-linear-gradient($from, $to);
|
||||||
|
background-image: -moz-linear-gradient($from, $to);
|
||||||
|
background-image: -o-linear-gradient($from, $to);
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin bg-light-gray-gradient {
|
||||||
|
background:#f1f1f1;
|
||||||
|
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
|
||||||
|
background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
|
||||||
|
background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
|
||||||
|
background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin bg-gray-gradient {
|
||||||
|
background:#eee;
|
||||||
|
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
|
||||||
|
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
|
||||||
|
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
|
||||||
|
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
|
||||||
|
}
|
||||||
|
|
||||||
|
@mixin bg-dark-gray-gradient {
|
||||||
|
background:#eee;
|
||||||
|
background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
|
||||||
|
background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
|
||||||
|
background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
|
||||||
|
}
|
||||||
6
app/assets/stylesheets/variables.scss
Normal file
6
app/assets/stylesheets/variables.scss
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
/** Colors **/
|
||||||
|
$link_color: #3A89A3;
|
||||||
|
$blue_link: #2FA0BB;
|
||||||
|
$style_color: #474D57;
|
||||||
|
$hover: #D9EDF7;
|
||||||
|
$hover_border: #ADF;
|
||||||
Loading…
Reference in a new issue