diff --git a/db/schema.rb b/db/schema.rb index a90e812..75d8102 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -381,16 +381,16 @@ create_table "users", force: :cascade do |t| t.string "firstname", limit: 255 t.string "surname", limit: 255 - t.string "email", limit: 255, default: "", null: false + t.string "email", limit: 255, default: "", null: false t.string "orcid_id", limit: 255 t.string "shibboleth_id", limit: 255 t.datetime "created_at" t.datetime "updated_at" - t.string "encrypted_password", limit: 255, default: "" + t.string "encrypted_password", limit: 255, default: "" t.string "reset_password_token", limit: 255 t.datetime "reset_password_sent_at" t.datetime "remember_created_at" - t.integer "sign_in_count", limit: 4, default: 0 + t.integer "sign_in_count", limit: 4, default: 0 t.datetime "current_sign_in_at" t.datetime "last_sign_in_at" t.string "current_sign_in_ip", limit: 255 @@ -410,6 +410,7 @@ t.string "invited_by_type", limit: 255 t.integer "language_id", limit: 4 t.string "recovery_email", limit: 255 + t.binary "prefs", limit: 65535 end add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree diff --git a/lib/assets/images/logo.png b/lib/assets/images/logo.png index fdead19..a5b9cd8 100644 --- a/lib/assets/images/logo.png +++ b/lib/assets/images/logo.png Binary files differ diff --git a/lib/assets/stylesheets/roadmap-hacks.scss b/lib/assets/stylesheets/roadmap-hacks.scss index 2586ab7..cf450a8 100644 --- a/lib/assets/stylesheets/roadmap-hacks.scss +++ b/lib/assets/stylesheets/roadmap-hacks.scss @@ -90,6 +90,9 @@ background-color: $primary-color; } +.header_org_banner_text, +.header_org_banner_text a, .header_org_banner_text a:link, .header_org_banner_text a:visited, +.header_org_banner_text a:active, .header_org_banner_text a:focus, .accordion_heading_text { color: $white; } @@ -101,7 +104,6 @@ position: relative; height: auto; width: 100%; - background-color: $primary-color; } div.header_left, div.header_right { position: relative; @@ -117,6 +119,9 @@ position: absolute; bottom: 0; } +div.header_org_banner_text_vertical_align { + margin-top: -20px; +} div.signin_signout_header_link { position: absolute; top: 2px; diff --git a/lib/assets/stylesheets/roadmap.scss b/lib/assets/stylesheets/roadmap.scss index 1896109..daad890 100644 --- a/lib/assets/stylesheets/roadmap.scss +++ b/lib/assets/stylesheets/roadmap.scss @@ -11,13 +11,15 @@ $medium-grey: #827D7E; $light-grey: #CCC; -$primary-color: #CC7A00; -$primary-admin-color: #CC7A00; +$primary-color: #F17D04; +$primary-admin-color: #F17D04; $disabled-button-color: #CCC; -$cancel-button-color: #36421A; +$cancel-button-color: #F17D04; $reverse-text: #FFF; -$header-height: 100px; +$header-gradient-light: #F59503; +$header-gradient-dark: #ED6406; +$header-height: 160px; /* See `.combobox-clear-button` for an example of this mixin in use */ @mixin icon($icon) { @@ -53,12 +55,13 @@ .main_header { margin-bottom: 20px; - + background: linear-gradient($header-gradient-dark, $header-gradient-light); + div.header_left { width: auto; .home_logo { - margin: 25px 10px 30px 10px; + margin: 0 10px 0 0; } } }