diff --git a/app/assets/stylesheets/desktop/_desktop-helper.scss b/app/assets/stylesheets/desktop/_desktop-helper.scss index 2b52ab42..cd8c11a9 100644 --- a/app/assets/stylesheets/desktop/_desktop-helper.scss +++ b/app/assets/stylesheets/desktop/_desktop-helper.scss @@ -1,24 +1,28 @@ $gray: #ddd; @mixin font-main($font-size) { - font-family: "Source Sans Pro", sans-serif; - font-size: #{$font-size}px; + font-family: "Source Sans Pro", sans-serif; + font-size: #{$font-size}px; } @mixin font-sub($font-size) { - font-family: "Source Sans Pro", Arial, sans-serif; - font-size: #{$font-size}px; + font-family: "Source Sans Pro", Arial, sans-serif; + font-size: #{$font-size}px; +} +@mixin font-icon($font-size) { + font-family: "FontAwesome"; + font-size: #{$font-size}px; } @mixin transition-type($property, $sec) { - -webkit-transition: #{$property} #{$sec}s ease; - -moz-transition: #{$property} #{$sec}s ease; - transition: #{$property} #{$sec}s ease; + -webkit-transition: #{$property} #{$sec}s ease; + -moz-transition: #{$property} #{$sec}s ease; + transition: #{$property} #{$sec}s ease; } @mixin box-sizing { - -webkit-box-sizing: border-box; /* webkit */ + -webkit-box-sizing: border-box; /* webkit */ -khtml-box-sizing: border-box; /* konqueror */ -moz-box-sizing: border-box; /* firefox */ -ms-box-sizing: border-box; /* ie */ - box-sizing: border-box; /* css3 */ + box-sizing: border-box; /* css3 */ } @mixin no-select { -webkit-touch-callout: none; diff --git a/app/assets/stylesheets/desktop/desktop.css b/app/assets/stylesheets/desktop/desktop.css index a5d650b1..5e8c4615 100644 --- a/app/assets/stylesheets/desktop/desktop.css +++ b/app/assets/stylesheets/desktop/desktop.css @@ -11,7 +11,6 @@ *= require desktop/font-awesome *= require basic/icon *= require desktop/desktop-component - *= require desktop/desktop-main *= require desktop/desktop-media *= require desktop/desktop-select2 *= require desktop/desktop-timeline