diff --git a/README.md b/README.md index 7f788183a189b911ceb0a674a6eb0c91f59f39e6..5f1e126f9601346e0abd875face518e7e7e96800 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,9 @@ files such as JS dependencies and fonts. You can spin up a development server with: - gulp + gulp -Head to [127.0.0.1:8080](127.0.0.1:8080) to view! +Head to [127.0.0.1:8000](127.0.0.1:8000) to view! Any changes made in `src/` are automatically applied to the dev server. DO NOT EDIT IN `build/`, changes WILL NOT be committed. \ No newline at end of file diff --git a/src/html/demo.html b/src/html/demo.html new file mode 100644 index 0000000000000000000000000000000000000000..9a84a341593e23075fc555d03a2e2243c99a72f6 --- /dev/null +++ b/src/html/demo.html @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Masonstrap 4 • Home + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/html/index.html b/src/html/index.html index 9d3f1a73469063b504e121b8a638f2e57b9b553c..1836d9431f1666db30815d1301aa7315f10162d9 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -35,10 +35,11 @@ + + +
+

+ + + + Masonstrap +

+
+ + diff --git a/src/scss/_mixins.scss b/src/scss/_mixins.scss index 517a24c81a11fb6cd953787a4488e9ba5aaaf789..2c9af9bed3e11a30904b78e9da1b5358f0ab7245 100644 --- a/src/scss/_mixins.scss +++ b/src/scss/_mixins.scss @@ -1 +1 @@ -// Custom Mixins \ No newline at end of file +// Custom Mixins diff --git a/src/scss/_overwrites.scss b/src/scss/_overwrites.scss index 1a0a3cc84887bfe78fee89b9b91036b960b4e690..2c4ecb46cbb64af2e521baa1e9548204cfaf88a8 100644 --- a/src/scss/_overwrites.scss +++ b/src/scss/_overwrites.scss @@ -1,7 +1 @@ // Things that originate from Bootstrap that we overwrite - -@each $color, $value in $theme-colors { - .btn-outline-#{$color} { - @include button-outline-variant($value, $gray-900); - } -} diff --git a/src/scss/_styles.scss b/src/scss/_styles.scss index 8d668cf3d21a9287e58a8a8822b173d8502d5d94..60f069431a5dbc3dc87d51ae46b3cfacd2e72956 100644 --- a/src/scss/_styles.scss +++ b/src/scss/_styles.scss @@ -1 +1,25 @@ -// Custom classes and styling \ No newline at end of file +// Custom classes and styling +.accent-btn-outline { + @include button-outline-variant(theme-color('accent'), $gray-900); +} + +html { + position: relative; + min-height: 100%; +} + +body { + /* Margin bottom by footer height */ + margin-bottom: 60px; +} + +.footer { + position: absolute; + bottom: 0; + width: 100%; + /* Set the fixed height of the footer here */ + height: 60px; + line-height: 60px; + /* Vertically center the text there */ + background-color: #f5f5f5; +} \ No newline at end of file diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index a4fcf0ca2375501432f93fbf83489e8aef862919..94475ede7de1a7facb5bf35a128866cc0013c41c 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -105,6 +105,7 @@ $colors: ( $theme-colors: ( primary: get-primary-palette('mason-green'), + accent: get-primary-palette('mason-gold'), secondary: $gray-600, success: $green, info: $cyan, @@ -112,5 +113,4 @@ $theme-colors: ( danger: $red, light: $gray-100, dark: $gray-800, - accent: get-primary-palette('mason-gold') );