diff options
| -rw-r--r-- | assets/stylesheets/responsive/_settings.scss | 4 | ||||
| -rw-r--r-- | assets/stylesheets/responsive/custom.scss | 47 | ||||
| -rw-r--r-- | init.rb | 1 | ||||
| -rw-r--r-- | install.rb | 1 | ||||
| -rw-r--r-- | lib/alavetelitheme.rb | 1 | ||||
| -rw-r--r-- | lib/config/custom-routes.rb | 1 | ||||
| -rw-r--r-- | lib/controller_patches.rb | 1 | ||||
| -rw-r--r-- | lib/customstates.rb | 1 | ||||
| -rw-r--r-- | lib/model_patches.rb | 1 | ||||
| -rw-r--r-- | lib/patch_mailer_paths.rb | 1 | ||||
| -rw-r--r-- | lib/tasks/alavetelitheme_tasks.rake | 1 | ||||
| -rw-r--r-- | locale-theme/en/app.po | 6 | ||||
| -rw-r--r-- | post_install.rb | 1 | ||||
| -rw-r--r-- | spec/alavetelitheme_spec.rb | 9 | ||||
| -rw-r--r-- | uninstall.rb | 1 |
15 files changed, 61 insertions, 16 deletions
diff --git a/assets/stylesheets/responsive/_settings.scss b/assets/stylesheets/responsive/_settings.scss index 466c902..015aece 100644 --- a/assets/stylesheets/responsive/_settings.scss +++ b/assets/stylesheets/responsive/_settings.scss @@ -19,6 +19,10 @@ $color_red: #e04b4b; $color_violet: #a94ca6; $color_purple: #5c377f; $color_white: #ffffff; +$color_off_white: #f3f1eb; +$color_light_grey: #e2dfd9; +$color_mid_grey: #959287; +$color_dark_grey: #6c6b68; $color_neutral_light: $color_sand; $color_neutral_dark: $color_black; diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index c93d8a4..d32f609 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -173,6 +173,28 @@ a.link_button_green_large { @include button-primary($size: large); } + +/* Action Bar Mixins */ + +@mixin follow-button { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + margin-bottom: 0; +} + +@mixin follower-count { + color: $color_dark_grey; + padding: 0.56em 1.25em; + border: 1px solid $color_light_grey; + position: relative; + left: -3px; + line-height: 1.6em; + border-left: 0; + border-radius: 3px; + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + /* Popups */ .popup { @@ -543,17 +565,21 @@ a.link_button_green_large { .request-header__action-bar__actions { .action-menu__button { @include button-secondary(); + &:after { + border-color: #a5a5a5 transparent transparent transparent; + right: 7%; + } } .action-bar__follow-button { .track__action { @include button-primary(); + @include follow-button(); } } .action-bar__follower-count { - padding: 3px; - font-size: 1.1rem; + @include follower-count(); } } @@ -797,14 +823,17 @@ dt { } /* Authority page */ -.action-bar__follower-count { - padding: 3px; - font-size: 1.1rem; -} +.authority__header__action-bar { + .action-bar__follow-button { + .track_action, + .link_button_green { + @include button-secondary(); + @include follow-button(); + } + } -.action-bar__follow-button { - .link_button_green { - @include button-secondary(); + .action-bar__follower-count { + @include follower-count(); } } @@ -0,0 +1 @@ +# -*- encoding : utf-8 -*- @@ -1 +1,2 @@ +# -*- encoding : utf-8 -*- # Install hook code here diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb index c245617..668d92a 100644 --- a/lib/alavetelitheme.rb +++ b/lib/alavetelitheme.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- theme_name = File.split(File.expand_path("../..", __FILE__))[1] theme_name.gsub!('-', '_') THEME_NAME = theme_name diff --git a/lib/config/custom-routes.rb b/lib/config/custom-routes.rb index 6d4cda4..98fccf7 100644 --- a/lib/config/custom-routes.rb +++ b/lib/config/custom-routes.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Here you can override or add to the pages in the core website Rails.application.routes.draw do diff --git a/lib/controller_patches.rb b/lib/controller_patches.rb index 5c48e70..6d796b0 100644 --- a/lib/controller_patches.rb +++ b/lib/controller_patches.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Add a callback - to be executed before each request in development, # and at startup in production - to patch existing app classes. # Doing so in init/environment.rb wouldn't work in development, since diff --git a/lib/customstates.rb b/lib/customstates.rb index d801c92..323a105 100644 --- a/lib/customstates.rb +++ b/lib/customstates.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # See `http://alaveteli.org/docs/customising/themes/#customising-the-request-states` # for more explanation of this file diff --git a/lib/model_patches.rb b/lib/model_patches.rb index b0c906f..d223e36 100644 --- a/lib/model_patches.rb +++ b/lib/model_patches.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Add a callback - to be executed before each request in development, # and at startup in production - to patch existing app classes. # Doing so in init/environment.rb wouldn't work in development, since diff --git a/lib/patch_mailer_paths.rb b/lib/patch_mailer_paths.rb index 99da10a..4533be0 100644 --- a/lib/patch_mailer_paths.rb +++ b/lib/patch_mailer_paths.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Add a callback - to be executed before each request in development, # and at startup in production - to patch existing app classes. # See http://stackoverflow.com/questions/7072758/plugin-not-reloading-in-development-mode diff --git a/lib/tasks/alavetelitheme_tasks.rake b/lib/tasks/alavetelitheme_tasks.rake index 1f1925b..3744d04 100644 --- a/lib/tasks/alavetelitheme_tasks.rake +++ b/lib/tasks/alavetelitheme_tasks.rake @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # desc "Explaining what the task does" # task :alavetelitheme do # # Task goes here diff --git a/locale-theme/en/app.po b/locale-theme/en/app.po index d2da165..6f58130 100644 --- a/locale-theme/en/app.po +++ b/locale-theme/en/app.po @@ -2,6 +2,6 @@ # is a good place to put both translations specific to your theme, and # "translations" of the core English words (e.g. you might want to # call FOI "RTI" throughougout, like this: - -msgid "Make and browse Freedom of Information (FOI) requests" -msgstr "Make and browse Right to Know (RTI) requests"
\ No newline at end of file +# +# msgid "Make and browse Freedom of Information (FOI) requests" +# msgstr "Make and browse Right to Know (RTI) requests" diff --git a/post_install.rb b/post_install.rb index 2dfabfd..5aae9ca 100644 --- a/post_install.rb +++ b/post_install.rb @@ -1 +1,2 @@ +# -*- encoding : utf-8 -*- # This file is executed in the Rails evironment by the `rails-post-install` script diff --git a/spec/alavetelitheme_spec.rb b/spec/alavetelitheme_spec.rb index 0bb0fab..6d2b366 100644 --- a/spec/alavetelitheme_spec.rb +++ b/spec/alavetelitheme_spec.rb @@ -1,11 +1,12 @@ +# -*- encoding : utf-8 -*- # If defined, ALAVETELI_TEST_THEME will be loaded in config/initializers/theme_loader ALAVETELI_TEST_THEME = 'alavetelitheme' require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','..','spec','spec_helper')) -describe "testing the truth" do +describe 'testing the truth' do - it 'should be true' do - assert true - end + it 'should be true' do + expect(true).to eq(true) + end end diff --git a/uninstall.rb b/uninstall.rb index 9738333..f6e78fd 100644 --- a/uninstall.rb +++ b/uninstall.rb @@ -1 +1,2 @@ +# -*- encoding : utf-8 -*- # Uninstall hook code here |