diff --git a/.env.example b/.env.example index d65034c..d3b2c45 100644 --- a/.env.example +++ b/.env.example @@ -8,7 +8,6 @@ PUMA_WORKERS=1 PUMA_MIN_THREADS=1 PUMA_MAX_THREADS=16 PUMA_PORT=4000 -PUMA_SOCKET=/tmp/ensl.sock PUMA_TIMEOUT=30 MYSQL_DATABASE=ensl diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss index b25a6be..8a1e0a9 100644 --- a/app/assets/stylesheets/_variables.scss +++ b/app/assets/stylesheets/_variables.scss @@ -88,7 +88,7 @@ $navbar-text: white; $flash-text: white; $flash-notice: #5a9aa8; -$flash-success: #1f7f5c; +$flash-success: $green; $flash-warning: $red; $flash-error: #e56c69; @@ -107,5 +107,5 @@ $input-dark-border-hover-colour: $blue; $input-dark-border-focus-colour: $green; $button-primary: #5a9aa8; -$button-secondary: #1f7f5c; +$button-secondary: $green; $button-text: white; diff --git a/app/assets/stylesheets/components/_flashes.scss b/app/assets/stylesheets/components/_flashes.scss index bb5d9d1..d290069 100644 --- a/app/assets/stylesheets/components/_flashes.scss +++ b/app/assets/stylesheets/components/_flashes.scss @@ -12,6 +12,7 @@ &.success { @include flash($flash-success); + &:before { content: "\f00c"; } @@ -19,6 +20,7 @@ &.error { @include flash($flash-error); + &:before { content: "\f00d"; } @@ -27,6 +29,7 @@ &.warning, &.alert { @include flash($flash-warning); + &:before { content: "\f071"; } @@ -42,10 +45,6 @@ div#errors { @include span-columns(12); margin-bottom: em(20); - &:before { - height: 100%; - } - strong { @include span-columns(12); margin-bottom: em(10); diff --git a/app/assets/stylesheets/components/_forms.scss b/app/assets/stylesheets/components/_forms.scss index 31acc1e..410696e 100644 --- a/app/assets/stylesheets/components/_forms.scss +++ b/app/assets/stylesheets/components/_forms.scss @@ -3,6 +3,17 @@ */ form { + .inline { + float: left; + display: inline-block; + width: auto; + margin-bottom: em(20); + + input { + margin-bottom: 0; + } + } + .fields { > .field_with_errors:first-child, > label { @@ -122,10 +133,13 @@ form { } &:hover { + border: $input-border-width solid lighten($input-secondary, 20%); cursor: pointer; } &:checked { + border-color: $button-secondary; + &:after { content: $fa-var-check; pointer-events: none; @@ -136,6 +150,7 @@ form { font-size: em(22); top: em(4); left: em(5); + color: $button-secondary; } } } diff --git a/app/assets/stylesheets/mixins/_flashes.scss b/app/assets/stylesheets/mixins/_flashes.scss index 2a20957..201ce22 100644 --- a/app/assets/stylesheets/mixins/_flashes.scss +++ b/app/assets/stylesheets/mixins/_flashes.scss @@ -23,7 +23,7 @@ left: 0; float: left; width: em(44); - height: em(44); + height: 100%; padding: em(9); line-height: em(26); text-align: center; diff --git a/app/assets/stylesheets/pages/_news.scss b/app/assets/stylesheets/pages/_news.scss index 24a15cd..f636657 100644 --- a/app/assets/stylesheets/pages/_news.scss +++ b/app/assets/stylesheets/pages/_news.scss @@ -10,6 +10,14 @@ div.article { .content { @include span-columns(12); margin-bottom: em(40); + + ul { + list-style-type: disc; + + li { + margin-left: em(20); + } + } } .author { diff --git a/app/assets/stylesheets/pages/_users.scss b/app/assets/stylesheets/pages/_users.scss index 1f0f184..fbd53b6 100644 --- a/app/assets/stylesheets/pages/_users.scss +++ b/app/assets/stylesheets/pages/_users.scss @@ -53,3 +53,80 @@ } } } + +/* + Agenda +*/ + +#agenda { + + h4 { + margin-bottom: 1em; + } + + table { + margin-bottom: em(20); + } + + form { + @include span-columns(12); + margin-bottom: em(20); + } + + .tab { + :last-child { + margin-bottom: 0; + } + } + + #teams { + + table { + margin-bottom: em(40); + } + } +} + +/* + Messages +*/ + +#messages { + h1 { + margin-bottom: 1em; + } + + .tab { + + :last-child { + margin-bottom: 0; + } + } + + .message { + @include span-columns(12); + margin-bottom: em(20); + + .subject { + margin-bottom: 1em; + } + + .content { + margin-bottom: em(20); + } + + a.message { + display: inline; + margin: 0; + float: none; + } + + &.highlight { + font-weight: bold; + } + } + + .back { + margin-top: em(20); + } +} diff --git a/app/views/messages/_message.html.erb b/app/views/messages/_message.html.erb new file mode 100644 index 0000000..8422028 --- /dev/null +++ b/app/views/messages/_message.html.erb @@ -0,0 +1,9 @@ +
+ <%= sanitize message.text[0, 100] %>... +
+ ++ <%= namelink message.sender %> on <%= longdate message.created_at %> +
diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb index 70fe85c..1d9ed26 100644 --- a/app/views/messages/index.html.erb +++ b/app/views/messages/index.html.erb @@ -1,39 +1,47 @@ -+
+ +You have no incoming messages.
<% end %>You have no sent messages.
+ <% end %>
- <%= f.label :sender %>
+
- <%= f.label :title %>
- <%= f.text_field :title %>
-
- <%= f.label :text %>
- <%= f.text_area :text %>
-
- <%= f.submit 'Send' %> -
-<% end %> -<%= link_to 'Back', messages_path %> +