diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss
index f1216a19a81..8ab59d8539d 100644
--- a/app/assets/stylesheets/_settings.scss
+++ b/app/assets/stylesheets/_settings.scss
@@ -18,9 +18,11 @@ $light-grey: #BBB;
$mid-grey: #777;
$dark-grey: #555;
+// $header-link-color: #5E91C9;
+$header-link-color: #4786CC;
+
$loomio-orange: #ffa600;
$header-color: #F2F2F2;
-$header-titles-color: #555;
$navbar-text-color: #BFBFBF;
$error-color: firebrick;
diff --git a/app/assets/stylesheets/discussions.css.scss b/app/assets/stylesheets/discussions.css.scss
index b32fb476507..d394ca0c190 100644
--- a/app/assets/stylesheets/discussions.css.scss
+++ b/app/assets/stylesheets/discussions.css.scss
@@ -9,10 +9,9 @@ body.discussions.new {
/** discussion show form*/
body.discussions.show {
- // .group-title {
- // margin-bottom: 10px;
- // padding-top: 43px;
- // }
+ h2#discussion-title {
+ font-size: 22px;
+ }
.selector-panel {
background-color: $selector-panel;
@include border-radius(8px);
@@ -20,11 +19,6 @@ body.discussions.show {
margin-bottom: 20px;
min-height: 59px;
padding-top: 2px;
- h2.panel-header {
- padding-left: 10px;
- float: left;
- min-height: 3px;
- }
.dropdown {
float: right;
padding: 5px 10px;
@@ -41,7 +35,6 @@ body.discussions.show {
display: inline-block;
width: 850px;
margin: 0 0 4px 0px;
- h1 { color: $dark-grey; }
}
#edit-discussion-title {
float: left;
@@ -100,7 +93,8 @@ body.discussions.show {
}
.header-text {
- color: $mid-grey;
+ // color: $mid-grey;
+ // font-weight: bold;
line-height: 2.0em;
}
}
@@ -133,13 +127,13 @@ li s hard.motion-preview {
font-size: 14px; /* should prob use a $var here eh? */
}
-.comment-body, .model-description, .motion {
+.comment-body, .model-description, .motion .description {
p {
word-wrap: break-word;
}
ul, ol, li {
margin-left: 10px;
- word-wrap: break-word;
+ word-wrap: break-word;
line-height: 18px;
}
ul{
@@ -168,6 +162,9 @@ li s hard.motion-preview {
h4{
font-size: 1.1em;
}
+ h5{
+ font-size: 1.0em;
+ }
}
/** Code block padding (Stops avatars destroying indentation) */
diff --git a/app/assets/stylesheets/groups.css.scss b/app/assets/stylesheets/groups.css.scss
index c40e3e80c3e..b36cf28ce91 100644
--- a/app/assets/stylesheets/groups.css.scss
+++ b/app/assets/stylesheets/groups.css.scss
@@ -8,13 +8,6 @@
// group title (on almost all pages)
.group-title {
margin: 0 0 10px 0;
- h1 {
- float: left;
- line-height: 1.2em;
- }
- h1 page-title a {
- color: $dark-grey;
- }
.home-title {
display: inline;
color: $dark-grey;
@@ -43,6 +36,7 @@
.privacy-dropdown {
display: inline;
width: 120px;
+ bottom: 5px;
}
.privacy-dropdown .dropdown-menu a{
padding-left: 5px;
@@ -127,10 +121,7 @@ body.groups.show {
border: 1px solid $light-grey;
margin-bottom: 20px;
padding: 6px 6px;
- h3 {
- font-size: $font-medium;
- color: $header-titles-color;
- display: inline;
+ h4 {
line-height: 1.8em;
margin-bottom: 5px;
}
@@ -159,7 +150,6 @@ body.groups.show {
/*group panel*/
.sub-panel#groups{
- h3 { display: block; }
ul {
.sub-group a{ padding-left: 20px; }
}
@@ -203,17 +193,11 @@ body.groups.show {
/* sub groups panel */
#sub-groups {
- h3 { display: block; }
.group-link a:hover {
color: $dark-grey;
}
}
-/* previous-discussions panel */
-.previous-discussions-panel {
- h3 { display: block; }
-}
-
/* membership request panel */
#member-requests { display: inline; }
@@ -264,7 +248,11 @@ input#user_email{
/* membership panel */
.dropdown#members { padding-left: 5px; }
-.user-name { float: left; }
+.user-name {
+ float: left;
+ a:hover { color: $dark-grey; }
+}
+
.membership-count {
float: right;
font-size: $font-small;
diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
index c672b4f4abf..2434e30274b 100644
--- a/app/assets/stylesheets/main.css.scss
+++ b/app/assets/stylesheets/main.css.scss
@@ -17,39 +17,16 @@ html { height: 100%; }
body {
background-color: $main-background;
height: 100%;
+ color: $dark-grey;
}
hr {
margin: 1px;
}
-// typography
-h1 {
- font-size: $font-xlarge;
- color: $mid-grey;
- a { color: $mid-grey; }
- a:hover { color: $mid-grey; }
- font-weight: normal;
- line-height: 1.6em;
+.group-title h2 {
+ color: #777;
display: inline;
-}
-h2 {
- font-size: $font-large;
- color: $header-titles-color;
- font-weight: normal;
- line-height: 1.6em;
- display: inline;
-}
-h3 {
- font-weight: bold;
- font-size: $font-medium-large;
-}
-
-h4 {
- font-weight: normal;
- font-size: $font-small;
-}
-h5 {
- font-size: $font-tiny;
+ a { color: $header-link-color; }
}
// structural elements (containers etc.)
@@ -61,9 +38,6 @@ h5 {
}
.popover { z-index: 10000; }
-.sub-panel li .group-link a {
- text-decoration: none;
-}
.sub_group {font-size: $font-tiny;}
// #start-new-discussion { margin: 0 0 20px 2px; }
diff --git a/app/assets/stylesheets/motions.css.scss b/app/assets/stylesheets/motions.css.scss
index 19d564a5613..cfb48f2bbad 100644
--- a/app/assets/stylesheets/motions.css.scss
+++ b/app/assets/stylesheets/motions.css.scss
@@ -102,14 +102,8 @@
/*** proposal (discussion page)***/
-#motion-title {
- h2 {
- float: left;
- padding-right: 10px;
- }
-}
#content-proposal{
- h3 { font-weight: normal; }
+ .motion-title { margin-top: 3px; }
margin-left: 0px;
.proposal-title-container {
width: 305px;
diff --git a/app/views/application/_see_closed_motions.html.haml b/app/views/application/_see_closed_motions.html.haml
index 81d0f0aeda9..7064bf5f939 100644
--- a/app/views/application/_see_closed_motions.html.haml
+++ b/app/views/application/_see_closed_motions.html.haml
@@ -1,3 +1,3 @@
.sub-panel.previous-discussions-panel
- %h3 Previous decisions
+ %h4 Previous decisions
= icon_button('#', 'See previous decisions', '/assets/pie-18.png', 'show-closed-motions')
\ No newline at end of file
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index 5dc2d0f32a7..776b8f4df0d 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -1,5 +1,5 @@
.sub-panel#groups
- %h3 Groups
+ %h4 Groups
= icon_button(request_new_group_path, 'Request new group', '/assets/group-18.png', 'request-new-group')
%ul#dashboard-groups-list
- current_user.root_groups.each do |group|
diff --git a/app/views/discussions/_title.html.haml b/app/views/discussions/_title.html.haml
index 4afaadf9641..e08e92cc578 100644
--- a/app/views/discussions/_title.html.haml
+++ b/app/views/discussions/_title.html.haml
@@ -1,7 +1,7 @@
.clearfix
.large-icon.topic-icon
.discussion-title-container
- %h1#discussion-title
+ %h2#discussion-title
= discussion.title
#edit-discussion-title.hidden
diff --git a/app/views/discussions/new.html.haml b/app/views/discussions/new.html.haml
index 3cec44b6caf..1e8e575952b 100644
--- a/app/views/discussions/new.html.haml
+++ b/app/views/discussions/new.html.haml
@@ -1,3 +1,5 @@
.page-container
- %h2 Start a discussion
- = render "/discussions/form", :discussion => @discussion, :user_groups => @user_groups#, :group => @group
+ - group = GroupDecorator.decorate(@discussion.group) if @discussion.group
+ = render '/groups/title', group: group
+ %h3 Start a discussion
+ = render "/discussions/form", :discussion => @discussion, :user_groups => @user_groups
diff --git a/app/views/discussions/show.html.haml b/app/views/discussions/show.html.haml
index 9f5b453a210..fcb40b9abbc 100644
--- a/app/views/discussions/show.html.haml
+++ b/app/views/discussions/show.html.haml
@@ -31,14 +31,14 @@
.row
.span6#content-history
.large-icon.discussion-icon.enabled-icon
- %h2.header-text Discussion
+ %h3.header-text Discussion
#content-history-body
= render 'add_comment', discussion: @discussion
= render 'history', discussion: @discussion, history: @discussion.history
.span6#content-proposal
.large-icon.decision-icon
- %h2.header-text Current decision
+ %h3.header-text Current decision
.content-proposal-body
%ul.selector-list
- if @current_motion
@@ -60,7 +60,7 @@
#previous-proposals
.clearfix
.large-icon.decision-icon
- %h2.header-text Previous decisions
+ %h3.header-text Previous decisions
.content-proposal-body
%ul.selector-list
diff --git a/app/views/group_requests/new.html.haml b/app/views/group_requests/new.html.haml
index 199a284cf1d..99d548f7766 100644
--- a/app/views/group_requests/new.html.haml
+++ b/app/views/group_requests/new.html.haml
@@ -1,18 +1,19 @@
-.row
- .offset1.span3
- = image_tag("mascot.gif")
- .span6
- %h1 Get started with Loomio
- %br
- %br
- %p Exciting news! Loomio is now in private beta!
- %p This means we’re still in development and have limited resources for user support, but we love bringing on nice groups that are keen to get on board early.
- %p There’s some basic info at loomio.org to make it easy to explain to your group why you’d like to use Loomio to make decisions together online.
- %p If your group is keen, you can request access here:
- %br
+.page-container
+ .row
+ .offset1.span3
+ = image_tag("mascot.gif")
+ .span6
+ %h1 Get started with Loomio
+ %br
+ %br
+ %p Exciting news! Loomio is now in private beta!
+ %p This means we’re still in development and have limited resources for user support, but we love bringing on nice groups that are keen to get on board early.
+ %p There’s some basic info at loomio.org to make it easy to explain to your group why you’d like to use Loomio to make decisions together online.
+ %p If your group is keen, you can request access here:
+ %br
- %a{ :href => "#request-new", :class => 'btn btn-large btn-info btn-block' , "data-toggle" => "modal", :id => 'request-new-group' }
- I’ve talked to my group, and we’d like to use Loomio!
+ %a{ :href => "#request-new", :class => 'btn btn-large btn-info btn-block' , "data-toggle" => "modal", :id => 'request-new-group' }
+ I’ve talked to my group, and we’d like to use Loomio!
-=render '/group_requests/request_new'
+ =render '/group_requests/request_new'
diff --git a/app/views/groups/_form.html.haml b/app/views/groups/_form.html.haml
index 29851ab9034..b2d6da08741 100644
--- a/app/views/groups/_form.html.haml
+++ b/app/views/groups/_form.html.haml
@@ -12,7 +12,7 @@
.character-counter
.privacy-settings
#settings-header
- %h3 Settings
+ %h4 Settings
%hr
- suffix = "group"
- suffix = "sub-group" unless group.parent.nil?
diff --git a/app/views/groups/_members.html.haml b/app/views/groups/_members.html.haml
index 7e374b799db..f90935ed234 100644
--- a/app/views/groups/_members.html.haml
+++ b/app/views/groups/_members.html.haml
@@ -2,7 +2,7 @@
.sub-panel
.membership-count.label
= group.memberships.count
- %h3 Members
+ %h4 Members
= render 'add_members', group: group
%ul#users-list
= render :partial => 'membership',
diff --git a/app/views/groups/_membership_requests.html.haml b/app/views/groups/_membership_requests.html.haml
index 853b2ea6d47..73b08b1f184 100644
--- a/app/views/groups/_membership_requests.html.haml
+++ b/app/views/groups/_membership_requests.html.haml
@@ -1,5 +1,5 @@
- if group.membership_requests.present? && (can? :add_members, group)
.sub-panel#user-requests
- %h3 Membership requests
+ %h4 Membership requests
%ul#request-list
=render :partial => 'membership_request', :collection => group.membership_requests
diff --git a/app/views/groups/_subgroups.html.haml b/app/views/groups/_subgroups.html.haml
index 85ed42296f7..6187c71b592 100644
--- a/app/views/groups/_subgroups.html.haml
+++ b/app/views/groups/_subgroups.html.haml
@@ -1,6 +1,6 @@
#sub-groups
.sub-panel
- %h3 Sub-groups
+ %h4 Sub-groups
- if (can? :add_subgroup, group) && group.users.include?(current_user)
= icon_button(add_subgroup_group_path(group), 'Create a sub-group', '/assets/group-18.png', 'subgroup-new')
%ul.group-links
diff --git a/app/views/groups/_title.html.haml b/app/views/groups/_title.html.haml
index 2d85be09e6b..6b9af37eb31 100644
--- a/app/views/groups/_title.html.haml
+++ b/app/views/groups/_title.html.haml
@@ -1,7 +1,7 @@
.page-container
.group-title.clearfix
- if group
- %h1
+ %h2
.home-title= link_to "Home", "/"
= content_tag :span, "\u25B6", class: 'name-separator'
= group.fancy_link
@@ -36,5 +36,5 @@
#email-members-modal.modal.hidden
= render "groups/email_members", :group => group
- else
- %h1
- .home-title= "Home"
+ %h2
+ .home-title= link_to "Home", "/"
diff --git a/app/views/groups/add_subgroup.html.haml b/app/views/groups/add_subgroup.html.haml
index 234edfe4e80..3ba5666029f 100644
--- a/app/views/groups/add_subgroup.html.haml
+++ b/app/views/groups/add_subgroup.html.haml
@@ -1,8 +1,6 @@
-- set_title @parent.name, "Add Sub-group"
-.group-title
- %h2
- = link_to @parent.name, group_path(@parent), title: "group" unless @parent.nil?
-#new-subgroup
- %h1 Add a subgroup to #{@parent.name}
- = render :partial => 'form',
- :locals => { :group => @subgroup, parent: @parent, submit_text: "Create group", :data => { :disable_with => "Creating group" } }
+.page-container
+ = render '/groups/title', group: GroupDecorator.decorate(@parent)
+ #new-subgroup
+ %h3 Add a sub-group
+ = render :partial => 'form',
+ :locals => { :group => @subgroup, parent: @parent, submit_text: "Create group", :data => { :disable_with => "Creating group" } }
\ No newline at end of file
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index a4a2cac8aed..699616c0229 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -1,4 +1,4 @@
- set_title "", "New Group"
-%h1 New Group
+%h2 New Group
= render 'form', group: @group, parent: @parent,
submit_text: "Create group", :data => { :disable_with => "Creating group" }
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index b5bac2ec0d1..90500f799a3 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -31,7 +31,7 @@
%section.span4
=render 'request_membership', group: @group
.sub-panel#group-description-panel
- %h3= "Group description"
+ %h4= "Group description"
=render '/application/description', model: @group, model_name: "group"
=render 'subgroups', subgroups: @subgroups, group: @group if display_subgroups_block?(@group)
=render '/application/see_closed_motions'
diff --git a/app/views/motions/_motion.html.haml b/app/views/motions/_motion.html.haml
index 52c879fa122..36d0e852652 100644
--- a/app/views/motions/_motion.html.haml
+++ b/app/views/motions/_motion.html.haml
@@ -1,6 +1,6 @@
.motion
.clearfix
- %h3.word-break= motion.name
+ %h3.motion-title.word-break= motion.name
- if motion.closed?
%span.label.label-important Closed
.closing-info
@@ -11,10 +11,10 @@
%span= "Closed #{time_ago_in_words(motion.close_date)} ago"
- else
No close date
- - if motion.closed?
- =render "motions/outcome_statement", motion: motion, this_group: this_group
.proposed-by
= "Proposed #{time_ago_in_words(motion.created_at)} ago by #{motion.author_name}"
+ - if motion.closed?
+ =render "motions/outcome_statement", motion: motion, this_group: this_group
.description