diff --git a/.gitignore b/.gitignore index f129506..dba3d69 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,9 @@ # Ignore branded content app/views/branded/* -app/assets/**/* +#app/assets/**/* config/locales/static_pages/*.yml +app/assets/stylesheets/*-branded.scss # Ignore gemfile.lock #Gemfile.lock diff --git a/.travis.yml b/.travis.yml index 0beeb02..d1badfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ - cp config/initializers/devise.rb.example config/initializers/devise.rb - cp config/initializers/recaptcha.rb.example config/initializers/recaptcha.rb - cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb + - cp app/assets/stylesheets/dmproadmap-branded.scss.example app/assets/stylesheets/dmproadmap-branded.scss + - cp app/assets/stylesheets/overrides-branded.scss.example app/assets/stylesheets/overrides-branded.scss - bundle exec rake db:drop RAILS_ENV=test - bundle exec rake db:create RAILS_ENV=test - bundle exec rake db:schema:load RAILS_ENV=test diff --git a/app/assets/stylesheets/dmproadmap-branded.scss.example b/app/assets/stylesheets/dmproadmap-branded.scss.example new file mode 100644 index 0000000..8ecace1 --- /dev/null +++ b/app/assets/stylesheets/dmproadmap-branded.scss.example @@ -0,0 +1,6 @@ +/* This file is intended for you to use to override the sites SASS variables */ +/* This file is loaded immediately after dmproadmap.scss and before dmproadmap.scss */ +/* ----------------------------------------------------------------------------------- */ + +$background-color: #FFF; +$color: $dark-grey; /* This example makes use of one of the variables defined in dmproadmap.scss */ \ No newline at end of file diff --git a/app/assets/stylesheets/overrides-branded.scss.example b/app/assets/stylesheets/overrides-branded.scss.example new file mode 100644 index 0000000..ea1c275 --- /dev/null +++ b/app/assets/stylesheets/overrides-branded.scss.example @@ -0,0 +1,2 @@ +/* Place your overrides to the generic site's styling here. */ +/* -------------------------------------------------------- */ diff --git a/app/assets/stylesheets/overrides.scss b/app/assets/stylesheets/overrides.scss new file mode 100644 index 0000000..b036de9 --- /dev/null +++ b/app/assets/stylesheets/overrides.scss @@ -0,0 +1,12 @@ +/* This file contains overrides to the core Bootstrap 3.x styling */ +/* -------------------------------------------------------------- */ + +/* Footer Section */ +footer { + margin-top: $footer-margin-top; + background: $footer-background; + color: $footer-color; + + a { color: $footer-color; } + +} \ No newline at end of file diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 3d0e76d..44cb3a6 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,19 +1,18 @@
-
-
-
-

<%= link_to( image_tag("dcc_logo.png", alt: 'Digital Curation Centre'), "http://www.dcc.ac.uk/", title: "Digital Curation Centre") %> -<%= link_to( image_tag("uc3_logo.jpg", class: "footer_logo", alt: 'University of California Curation Center'), "http://www.cdlib.org/uc3/", title: "University of California Curation Center", id: "footer_right_uc3", ) %>

-
+

+ <%= link_to( image_tag("dcc_logo.png", alt: 'Digital Curation Centre'), "http://www.dcc.ac.uk/", title: "Digital Curation Centre") %><%= link_to( image_tag("uc3_logo.jpg", class: "footer_logo", alt: 'University of California Curation Center'),"http://www.cdlib.org/uc3/", title: "University of California Curation Center", id: "footer_right_uc3", ) %> +

+
diff --git a/lib/assets/stylesheets/application.scss b/lib/assets/stylesheets/application.scss index df35cd6..848fba6 100644 --- a/lib/assets/stylesheets/application.scss +++ b/lib/assets/stylesheets/application.scss @@ -19,14 +19,20 @@ *= require jquery-ui-dist/jquery-ui.structure.min *= require jquery-ui-dist/jquery-ui.theme.min */ - @import "font-awesome"; +/* SASS Variables */ @import "dmproadmap"; -@import "dmproadmap/base"; +@import "dmproadmap-branded"; /* Place your customizations to the SASS variables in this file */ +/* These will eventually go away once Boostrap is in place */ +@import "dmproadmap/base"; @import "dmproadmap/tabs"; @import "dmproadmap/accordions"; @import "dmproadmap/modals"; @import "dmproadmap/tables"; -@import "dmproadmap/forms"; \ No newline at end of file +@import "dmproadmap/forms"; + +/* Overrides to Bootstrap styling */ +@import "overrides"; +@import "overrides-branded"; /* Place your customizations to the general CSS in this file */ diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss index 86aec57..1b08c9e 100644 --- a/lib/assets/stylesheets/dmproadmap.scss +++ b/lib/assets/stylesheets/dmproadmap.scss @@ -5,15 +5,16 @@ font-weight: normal; } -$font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; -$header-font: "GillSansLight"; - $black: #000; $white: #FFF; $dark-grey: #333; $medium-grey: #827D7E; $light-grey: #CCC; +$font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; + + + $primary-color: #4f5253; $highlight-color: $black; @@ -44,4 +45,15 @@ $header-logo-top-margin: 20px; $header-logo-left-margin: 10px; -$body-background: $white; \ No newline at end of file + + +/* EVERYTHING BELOW THIS LINE IS SPECIFIC TO THE BOOSTRAP 3.x IMPLEMENTATION OF ROADMAP */ +/* ------------------------------------------------------------------------------------ */ +/* SASS variables */ +$body-background: $white; + +$header-font: "GillSansLight"; + +$footer-background: $body-background; +$footer-color: $dark-grey; +$footer-margin-top: 40px; diff --git a/lib/assets/stylesheets/dmproadmap/accordions.scss b/lib/assets/stylesheets/dmproadmap/accordions.scss index d5ba50b..e336806 100644 --- a/lib/assets/stylesheets/dmproadmap/accordions.scss +++ b/lib/assets/stylesheets/dmproadmap/accordions.scss @@ -1,3 +1,4 @@ +/* .accordion { position: relative; width: 100%; @@ -43,4 +44,5 @@ .muted { margin: 0 8px; } -} \ No newline at end of file +} +*/ \ No newline at end of file diff --git a/lib/assets/stylesheets/dmproadmap/base.scss b/lib/assets/stylesheets/dmproadmap/base.scss index 47d500c..ad94e76 100644 --- a/lib/assets/stylesheets/dmproadmap/base.scss +++ b/lib/assets/stylesheets/dmproadmap/base.scss @@ -5,6 +5,7 @@ } /* Main page layout: header, content, footer */ +/* body { background: $body-background; color: $black; @@ -67,10 +68,12 @@ list-style: none; padding-left: 0; } +*/ /* This class will ensure that the item is hidden for sighted users and that it does not take up space */ /* For example:

<%= _('Create account') %>

*/ /* will be read on a screen reader for a tabbed section that opens but will be hidden visually */ +/* .aria-only { visibility: hidden; display: inline; @@ -88,8 +91,9 @@ width: 100%; border-bottom: 1px solid $primary-color; } - +*/ /* General dropdown menu styling */ +/* .caret { display: inline-block; vertical-align: middle; @@ -167,8 +171,10 @@ border-radius: 3px; z-index: 9; } +*/ /* General Anchor and Button styling */ +/* a, a:link, a:active, a:visited, a:hover, a:focus, button.button-as-link, button.button-as-link:hover, button.button-as-link:focus { color: $primary-color; @@ -187,16 +193,19 @@ border: 1px solid $light-grey; border-radius: 5px; } +*/ /* Basic page layout */ /* =================================================================================== */ +/* div.roadmap { position: relative; width: 90%; margin: 0 auto; - +*/ /* HEADER SECTION */ /* ----------------------------------------------------- */ + /* header { background: $header-background; color: $header-text-color; @@ -211,7 +220,6 @@ height: $header-height; .home-logo { margin-right: 10px; - /* margin-top: $header-logo-top-margin; */ margin-left: $header-logo-left-margin; vertical-align: middle; @@ -342,8 +350,9 @@ } } } - +*/ /* INFORMATION/ERROR MESSAGE BOX */ +/* div.roadmap-info-box, div.roadmap-alert-box { position: relative; @@ -382,9 +391,11 @@ color: $error-color; } } - +*/ + /* MAIN CONTENT */ /* ----------------------------------------------------- */ +/* main { clear: both; @@ -399,7 +410,6 @@ border-radius: 3px; padding: 10px 15px 25px 15px; - /* By default, page content is one column, but use the below styles to create a 2 column style */ div.column-left { display: inline-block; width: 55%; @@ -412,7 +422,6 @@ vertical-align: top; } - /* Description Lists - Used to display the read-only version of forms */ dl { width: 85%; margin: 0 auto; @@ -445,47 +454,5 @@ } } } - - /* FOOTER SECTION */ - /* ----------------------------------------------------- */ - footer { - width: 100%; - border-top: .5px solid $medium-grey; - margin-top: 35px; - - .footer-left, .footer-right { - display: inline-block; - } - - .footer-left { - width: 65%; - - p { - color: $medium-grey; - } - - ul.footer-links { - padding-left: 0; - - li a { - color: $medium-grey; - } - - li { - display: inline-block; - - a { - text-decoration: none; - } - } - li.muted { - margin: 0 5px; - } - } - } - .footer-right { - text-align: right; - width: 30%; - } - } -} \ No newline at end of file +} +*/ \ No newline at end of file diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss index ca145f5..5b7bc2b 100644 --- a/lib/assets/stylesheets/dmproadmap/forms.scss +++ b/lib/assets/stylesheets/dmproadmap/forms.scss @@ -3,6 +3,7 @@ /* The top of this file is generic form styles and */ /* the bottom contains page specific changes to the generic */ /* ================================================ */ +/* textarea, input[type="text"], input[type="email"], input[type="password"], input[type="search"], input[type="tel"], select { @@ -19,8 +20,10 @@ input[type="checkbox"], input[type="radio"], select { border: 1px solid $medium-grey; } +*/ /* Tinymce control hover (e.g. bold, italic, etc.) */ +/* .mce-btn button:hover { background-color: $white; } @@ -72,9 +75,11 @@ font-weight: normal; } } +*/ /* Roadmap Form Styling */ /* ------------------------------------------------ */ +/* form.roadmap-form { text-align: top; @@ -87,9 +92,10 @@ fieldset.padded { padding: 10px 10px 25px 10px; } - +*/ /* Fieldset with labels over inputs */ /* -------------------------------- */ +/* fieldset.standard { padding: 5px; background-color: $white; @@ -137,9 +143,10 @@ margin-left: 5px; } } - +*/ /* Fieldset with labels to the left of inputs */ /* ------------------------------------------ */ +/* fieldset.side-by-side { border: 0; @@ -191,8 +198,9 @@ } } } - +*/ /* Generic Fieldset Settings */ +/* fieldset legend { font-family: $header-font; color: $primary-color; @@ -203,7 +211,7 @@ margin-bottom: 20px; padding-left: 5px; - float: left; /* positions the legend within the fieldset box */ + float: left; border-bottom: none; } @@ -237,7 +245,9 @@ max-width: 340px; width: 45%; } +*/ /* Used for the jquery autocomplete combobox on side-by-side fieldsets */ +/* .fixed-width-large { width: 550px; } @@ -252,8 +262,9 @@ background-color: $cancel-button-color; color: $white; } - +*/ /* Tooltip */ +/* .arrow-left { display: inline-block; width: 0; @@ -270,8 +281,10 @@ div.form-input { position: relative; } +*/ /* Input validation errors */ +/* .red-border { border: 1px solid $error-color; box-shadow: 0 0 6px $error-background; @@ -336,9 +349,11 @@ font-size: 44px; } } - +*/ + /* Accessible JQuery combobox */ /* ------------------------------------------------------ */ +/* .invisible { border: 0; clip: rect(0 0 0 0); @@ -352,7 +367,7 @@ .combobox-container { position: relative; - width: 370px; /* 95%; */ + width: 370px; font-family: $font-family; } @@ -397,11 +412,13 @@ padding-top: 3px; font-size: 16pt; } - +*/ + /* http://geektnt.com/how-to-remove-x-from-search-input-field-on-chrome-and-ie.html */ +/* .js-combobox[type=text]::-ms-clear { display: none; width: 0; height: 0; } .js-combobox[type=text]::-ms-reveal { display: none; width: 0; height: 0; } - +*/ /* ------------------------------------------------ */ /* ------------------------------------------------ */ @@ -412,6 +429,7 @@ /* Sign in/Create account and edit profile forms */ /* ------------------------------------------------ */ +/* .omniauth-options { display: block; width: 100%; @@ -504,16 +522,17 @@ margin-bottom: 5px; a:hover { - color: $primary-color !important; /* Remove the important once the bootstrap_and_overrides css is gone */ + color: $primary-color !important; } } #new_user #password-reset-form { width: 50%; } - +*/ /* Shibboleth Custom Discovery Service form */ /* ------------------------------------------------ */ +/* #shibboleth-ds { width: 50%; } @@ -556,10 +575,12 @@ div.one-column { width: 95%; } +*/ /* ------------------------------------------------ */ /* Orcid Component */ /* ------------------------------------------------ */ +/* #connect-orcid-button{ border: 1px solid #D3D3D3; padding: 5px 5px 5px 20px; @@ -595,9 +616,11 @@ color: #338caf; text-decoration: none; } - +*/ + /* View plans */ /* ------------------------------------------------ */ +/* div.main_page_content p #create-test { vertical-align: middle; } @@ -614,9 +637,11 @@ } } } - +*/ + /* Create plan */ /* ------------------------------------------------ */ +/* #create_plan { position: relative; @@ -656,9 +681,11 @@ } } } +*/ /* Show/Edit plan details */ /* ------------------------------------------------ */ +/* .project-title-container { width: 60%; } @@ -697,9 +724,11 @@ } } } +*/ /* Write plan */ /* ------------------------------------------------ */ +/* #sections-accordion-controls { width: 55%; margin: 15px 0 15px 45px; @@ -741,8 +770,11 @@ } } } +*/ + +/* Section title / progress */ +/* #sections-accordion { - /* Section title / progress */ h2 { font-size: 18px; @@ -776,8 +808,10 @@ .section-description { width: 60%; } +*/ /* Example Answers */ +/* div.suggested-answer-div { width: 80%; margin: 10px 15px; @@ -850,9 +884,11 @@ } } } +*/ /* Share plan */ /* ------------------------------------------------ */ +/* #collaborator-table { min-width: 450px; max-width: 850px; @@ -862,10 +898,11 @@ .share-plan form.roadmap-form fieldset.standard label { margin-left: 10px; } - +*/ /* Org edit */ /* ------------------------------------------------ */ +/* #edit_org_details { .org-logo { margin-bottom: 10px; @@ -898,9 +935,10 @@ margin-top: 15px; } } - +*/ /* Plan Export Page */ /* ------------------------------------------------ */ +/* #pdf-format-options { select, label{ display: block; @@ -915,3 +953,4 @@ } } } +*/ \ No newline at end of file diff --git a/lib/assets/stylesheets/dmproadmap/modals.scss b/lib/assets/stylesheets/dmproadmap/modals.scss index aadfca2..42d43f1 100644 --- a/lib/assets/stylesheets/dmproadmap/modals.scss +++ b/lib/assets/stylesheets/dmproadmap/modals.scss @@ -1,3 +1,4 @@ +/* div.ui-dialog { width: 100%; padding: 0 10px 20px 10px; @@ -24,4 +25,5 @@ font-size: 18px; } } -} \ No newline at end of file +} +*/ \ No newline at end of file diff --git a/lib/assets/stylesheets/dmproadmap/tables.scss b/lib/assets/stylesheets/dmproadmap/tables.scss index 2733e5a..488788f 100644 --- a/lib/assets/stylesheets/dmproadmap/tables.scss +++ b/lib/assets/stylesheets/dmproadmap/tables.scss @@ -1,5 +1,6 @@ /* Tables */ /* ------------------------------------------- */ +/* table { width: 100%; border: 1px solid $primary-color; @@ -42,13 +43,16 @@ td { border-right: 1px solid $light-grey; } td:last-child { border: none; } } +*/ /* TODO: THIS ISN'T WORKING PARTIALLY DUE TO ROW ADDED BY JQUERY TABLESORTER */ +/* tbody tr.table-data:last-child { border-bottom: none; } - +*/ /* TABLE SEARCH BAR */ +/* .toolbar { position: relative; text-align: right; @@ -64,3 +68,4 @@ } } } +*/ \ No newline at end of file diff --git a/lib/assets/stylesheets/dmproadmap/tabs.scss b/lib/assets/stylesheets/dmproadmap/tabs.scss index b327b21..ed63d95 100644 --- a/lib/assets/stylesheets/dmproadmap/tabs.scss +++ b/lib/assets/stylesheets/dmproadmap/tabs.scss @@ -1,5 +1,6 @@ /* Roadmap Tab Styling */ /* ------------------------------------------------ */ +/* .tabs { list-style: none; margin: 0; @@ -69,4 +70,5 @@ } .tab-panel div.active { z-index: 1; -} \ No newline at end of file +} +*/ \ No newline at end of file