Skip to content

Bigger buttons #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MBSchneider wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bigger buttons #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c642fb
Adds button look to Organizations and Venues 'create' action, and Org…
MBSchneider Apr 4, 2014
7703d90
Merge remote-tracking branch 'upstream/master' into bigger_buttons
MBSchneider Apr 4, 2014
95c9184
Updates button CSS to reduce duplication
MBSchneider Apr 11, 2014
196f6fc
Removes font-family
MBSchneider Apr 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,22 @@ input[type=text], input[type=url], textarea {
color: $text-color;
}

.action-btn {
&:hover {
text-decoration: none;
}
-webkit-appearance: button;
color: #0088cc;
background-color: rgb(192, 192, 192);
border-color: rgb(192, 192, 192);
border-style: outset;
border-width: 2px;
display: inline-block;
font-size: 11px;
margin: 2px;
padding: 10px 15px;
}


/*---[ sidebar ]------------------------------------------------------------*/

Expand Down
5 changes: 2 additions & 3 deletions app/views/organizations/_item.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
.organization-title= organization.name

.organization-source-actions
.show-sources>= link_to t('.sources.show'), '#'
,
.add-source= link_to t('.sources.add'), new_organization_source_path(organization)
.add-source= link_to t('.sources.add'), new_organization_source_path(organization), :class => 'action-btn', :style => 'padding: 3px 5px'
.show-sources= link_to t('.sources.show'), '#', :class => 'action-btn', :style => 'padding: 3px 5px'

- if organization.url?
%h2.organization-url-title= t('.url.title')
Expand Down
3 changes: 2 additions & 1 deletion app/views/site/_wiki_props_index.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
%h3.wiki-index-title= t('.title', :obj => collection_name)

.wiki-actions
- add_link = link_to t('.add'), new_polymorphic_path(collection.klass)
- add_link = link_to t('.add'), new_polymorphic_path(collection.klass), :class => 'action-btn'

= t('.actions', :add => add_link, :obj => object_name, :collection => collection_name).html_safe
4 changes: 2 additions & 2 deletions config/locales/activate/en-x-activate-hub.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ en-x-activate-hub:
text: >
Search for events and organizations in your community. Get educated,
get involved, and start making a difference!
<form method="get" action="http://activatehub.us4.list-manage1.com/subscribe" target="_blank">
<form method="get" action="http://activatehub.us4.list-manage1.com/subscribe" target="_blank">
<input type="hidden" name="u" value="e60bb687d7e9506a113b83dce" />
<input type="hidden" name="id" value="d9bc31ac22" />
<button style="padding:10px 15px">Newsletter Sign-up</button>
<button class="action-btn" style="padding:10px 15px">Newsletter Sign-up</button>
</form>
events:
index:
Expand Down