Commit 1aadaca
Changed files (2)
app
assets
stylesheets
app/assets/stylesheets/application.scss
@@ -15,5 +15,3 @@
*= require_tree .
*/
-
-@import "foundation_and_overrides";
app/assets/stylesheets/global.scss
@@ -1,4 +1,5 @@
@import url(http://fonts.googleapis.com/css?family=Playfair+Display:900);
+@import "foundation_and_overrides";
/* ---------------------------------------------- */
/* Mixins --------------------------------------- */
/* ---------------------------------------------- */
@@ -21,49 +22,47 @@
/* ---------------------------------------------- */
header {
padding: 0.5em 0;
+}
- h1 {
- font-family: 'Playfair Display', sans-serif;
+header h1 {
+ font-family: 'Playfair Display', sans-serif;
+}
- .svg-container {
- @include responsive-svg(10, 20, 0.85em); // (width, height, containerWidth)
+header .svg-container {
+ @include responsive-svg(10, 20, 0.85em); // (width, height, containerWidth)
- img {
- margin: 0 0.15em 0 0;
- width: 18px;
- }
- }
+ img {
+ margin: 0 0.15em 0 0;
+ width: 18px;
}
}
-nav {
- h1 {
- font-family: 'PT Sans Narrow', sans-serif;
- text-transform: uppercase;
- white-space: nowrap;
- }
+nav h1 {
+ font-family: 'PT Sans Narrow', sans-serif;
+ text-transform: uppercase;
+ white-space: nowrap;
+}
- svg {
- display: inline-block;
- fill: $white;
- float: left;
- margin: 5px 8px 0 20px;
- position: relative;
- width: 12px;
- z-index: 100;
- }
+nav svg {
+ display: inline-block;
+ fill: $white;
+ float: left;
+ margin: 5px 8px 0 20px;
+ position: relative;
+ width: 12px;
+ z-index: 100;
}
/* ---------------------------------------------- */
/* Buttons -------------------------------------- */
/* ---------------------------------------------- */
-.button.bare, .button.bare:hover, .button.bare:active,
-.button.bare:visited,
-.button.bare:focus {
- background-color: transparent;
- border-color: transparent;
- padding-left: 1.5rem;
- padding-right: 1.5rem;
-}
-.button.bare:hover {
- text-decoration: underline;
+.button.bare {
+ &:hover, &:active, &:visited, &:focus {
+ background-color: transparent;
+ border-color: transparent;
+ padding-left: 1.5rem;
+ padding-right: 1.5rem;
+ }
+ &:hover {
+ text-decoration: underline;
+ }
}