From 0e80a843746097e9bf2d51c4d17c7a7f7ef3ac46 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 11 Nov 2013 14:56:33 -0800 Subject: [PATCH 1/1] Fix small screen header on interior pages --- app/assets/stylesheets/common.css.scss | 18 +----------------- app/assets/stylesheets/parameters.scss | 17 +++++++++++++++++ app/assets/stylesheets/small.css.scss | 3 +++ 3 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 app/assets/stylesheets/parameters.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index de0bad969..4c23a3c0d 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1,20 +1,4 @@ -/* Parameters */ -$lineheight: 20px; -$typeheight: 14px; - -$offwhite: #f4f4ff; -$blue: #7092FF; -$lightblue: #B8C5F0; -$green: #7ebc6f; -$grey: #CCC; -$red: red; -$lightgrey: #EEE; -$darkgrey: #AAA; -$hovercolor: 20%; -$headerHeight: 54px; -$sidebarWidth: 300px; -$keyline: 1px solid $lightgrey; -$border-radius: 3px; +@import "parameters"; /* Styles common to large and small screens */ diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss new file mode 100644 index 000000000..013c7ae96 --- /dev/null +++ b/app/assets/stylesheets/parameters.scss @@ -0,0 +1,17 @@ +/* Parameters */ +$lineheight: 20px; +$typeheight: 14px; + +$offwhite: #f4f4ff; +$blue: #7092FF; +$lightblue: #B8C5F0; +$green: #7ebc6f; +$grey: #CCC; +$red: red; +$lightgrey: #EEE; +$darkgrey: #AAA; +$hovercolor: 20%; +$headerHeight: 54px; +$sidebarWidth: 300px; +$keyline: 1px solid $lightgrey; +$border-radius: 3px; diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss index 5e8edc28c..39b946af0 100644 --- a/app/assets/stylesheets/small.css.scss +++ b/app/assets/stylesheets/small.css.scss @@ -1,3 +1,5 @@ +@import "parameters"; + /* Styles specific to a small screen, such as iPhone, Android, etc... */ input[type="submit"], @@ -23,6 +25,7 @@ nav.secondary { header { height: auto; + min-height: $headerHeight; background: #fff; h1 { -- 2.43.2