diff options
14 files changed, 48 insertions, 22 deletions
diff --git a/app/assets/stylesheets/new/_layout.sass b/app/assets/stylesheets/_layout.sass index 4321b6cb4..0a5006333 100644 --- a/app/assets/stylesheets/new/_layout.sass +++ b/app/assets/stylesheets/_layout.sass @@ -9,9 +9,15 @@ html box-sizing: inherit body - padding-top: 60px + padding-top: 40px font-family: $base-font-family font-size: $base-font-size line-height: $line-height color: $darkgrey background-color: #fff + +.page_header + padding: 40px 35px 0 35px + +.page_content + padding: 20px 35px 0 35px diff --git a/app/assets/stylesheets/application_new.sass b/app/assets/stylesheets/application_new.sass index 3713be739..74919f7b4 100644 --- a/app/assets/stylesheets/application_new.sass +++ b/app/assets/stylesheets/application_new.sass @@ -2,11 +2,13 @@ // Custom // //----------// -@import 'new/config' +@import 'base/config' -@import 'new/fonts' -@import 'new/typography' +@import 'typography/fonts' +@import 'typography/typography' -@import 'new/layout' +@import 'layout' -@import 'new/components/*' +@import 'components/buttons' +@import 'components/main_nav' +@import 'components/page_header' diff --git a/app/assets/stylesheets/new/_config.sass b/app/assets/stylesheets/base/_config.sass index 2660ae3cb..2660ae3cb 100644 --- a/app/assets/stylesheets/new/_config.sass +++ b/app/assets/stylesheets/base/_config.sass diff --git a/app/assets/stylesheets/components/_buttons.sass b/app/assets/stylesheets/components/_buttons.sass new file mode 100644 index 000000000..32f0def24 --- /dev/null +++ b/app/assets/stylesheets/components/_buttons.sass @@ -0,0 +1,22 @@ +//-----------// +// Buttons // +//-----------// + +.btn + &.btn-primary + background-color: $darkblue + border-color: darken($darkblue, 2.5%) + color: #fff + + &:hover, &:focus, &.focus, &:active, &.active, + .open > .btn-primary.dropdown-toggle + background-color: darken($darkblue, 2.5%) + border-color: darken($darkblue, 2.5%) + color: #fff + +.btn-helper-txt + font-size: 0.85em + margin: 5px 0 0 0 + + &:first-child + margin: 0 0 5px 0 diff --git a/app/assets/stylesheets/new/components/_main_nav.sass b/app/assets/stylesheets/components/_main_nav.sass index 7420b9bff..c4dbc95e4 100644 --- a/app/assets/stylesheets/new/components/_main_nav.sass +++ b/app/assets/stylesheets/components/_main_nav.sass @@ -94,6 +94,7 @@ $menuW: 300px > a display: block + text-decoration: none padding: 0 25px color: rgba(#fff, 0.75) transition: 0.2s diff --git a/app/assets/stylesheets/components/_page_header.sass b/app/assets/stylesheets/components/_page_header.sass new file mode 100644 index 000000000..85fff908f --- /dev/null +++ b/app/assets/stylesheets/components/_page_header.sass @@ -0,0 +1,10 @@ +.page_header + background-color: $blue + color: #fff + + h1 + margin: 0 + + .small.fa + color: #fff + margin-left: 0.5em diff --git a/app/assets/stylesheets/main/compliance_check_tasks.sass b/app/assets/stylesheets/main/compliance_check_tasks.sass deleted file mode 100644 index 78141bf22..000000000 --- a/app/assets/stylesheets/main/compliance_check_tasks.sass +++ /dev/null @@ -1 +0,0 @@ -#workspace.compliance_check_tasks.new, #workspace.compliance_check_tasks.create
\ No newline at end of file diff --git a/app/assets/stylesheets/main/subscriptions.sass b/app/assets/stylesheets/main/subscriptions.sass deleted file mode 100644 index 0ef6aba3e..000000000 --- a/app/assets/stylesheets/main/subscriptions.sass +++ /dev/null @@ -1,5 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -// #workspace.subscriptions.create, #workspace.subscriptions.new
\ No newline at end of file diff --git a/app/assets/stylesheets/main/timebands.sass b/app/assets/stylesheets/main/timebands.sass deleted file mode 100644 index e69de29bb..000000000 --- a/app/assets/stylesheets/main/timebands.sass +++ /dev/null diff --git a/app/assets/stylesheets/main/users.sass b/app/assets/stylesheets/main/users.sass deleted file mode 100644 index e99c60660..000000000 --- a/app/assets/stylesheets/main/users.sass +++ /dev/null @@ -1,5 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.users.edit, #workspace.lines.new
\ No newline at end of file diff --git a/app/assets/stylesheets/main/vehicle_journey_imports.sass b/app/assets/stylesheets/main/vehicle_journey_imports.sass deleted file mode 100644 index c02139389..000000000 --- a/app/assets/stylesheets/main/vehicle_journey_imports.sass +++ /dev/null @@ -1 +0,0 @@ -// #workspace.vehicle_journey_imports.new
\ No newline at end of file diff --git a/app/assets/stylesheets/main/welcome.sass b/app/assets/stylesheets/main/welcome.sass deleted file mode 100644 index 77ce11a74..000000000 --- a/app/assets/stylesheets/main/welcome.sass +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the welcome controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/new/_fonts.sass b/app/assets/stylesheets/typography/_fonts.sass index cb370eb86..cb370eb86 100644 --- a/app/assets/stylesheets/new/_fonts.sass +++ b/app/assets/stylesheets/typography/_fonts.sass diff --git a/app/assets/stylesheets/new/_typography.sass b/app/assets/stylesheets/typography/_typography.sass index 4060a2449..ef6d05203 100644 --- a/app/assets/stylesheets/new/_typography.sass +++ b/app/assets/stylesheets/typography/_typography.sass @@ -1,6 +1,6 @@ h1 font-size: $h1-size - font-weight: 700 + font-weight: 400 h2 font-size: $h2-size |