From 1ed216df2537b2af9e4a72c4c6f6d95094f03cea Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 18:59:58 +0100 Subject: [PATCH 01/15] update sharing settings --- app/views/services/index.html.haml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index ea762073..1ab92c75 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -6,9 +6,9 @@ .panel-body - if @services.count > 0 Sharing is enabled for the following services: - %ul + %ul.list-group - @services.each do |service| - %li + %li.list-group-item %strong= service.provider.capitalize (#{service.nickname}) = link_to 'Disconnect', service_path(service), data: { confirm: "Really disconnect service #{service.provider.capitalize}?" }, method: :delete @@ -17,4 +17,14 @@ - APP_CONFIG['sharing'].each do |service, service_options| - if service_options['enabled'] and !@services.any? { |x| x.provider == service.to_s } - %p=link_to "Connect to #{service.capitalize}", "/auth/#{service}" \ No newline at end of file + %p=link_to "Connect to #{service.capitalize}", "/auth/#{service}" + + / Show the list-group here, because it perfectly aligns outside a panel-body + - if @services.count > 0 + %ul.list-group + - @services.each do |service| + %li.list-group-item + %i.fa.fa-#{service.provider} + %strong= service.provider.capitalize + (#{service.nickname}) + = link_to 'Disconnect', service_path(service), data: { confirm: "Really disconnect service #{service.provider.capitalize}?" }, method: :delete \ No newline at end of file From e0871a661ba0bb36af4e7c5516fe6ebd578fada8 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 19:04:27 +0100 Subject: [PATCH 02/15] fix sharing settings --- app/views/services/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index 1ab92c75..481be62f 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -24,7 +24,7 @@ %ul.list-group - @services.each do |service| %li.list-group-item - %i.fa.fa-#{service.provider} + %i{class: "fa fa-#{service.provider}"} %strong= service.provider.capitalize (#{service.nickname}) = link_to 'Disconnect', service_path(service), data: { confirm: "Really disconnect service #{service.provider.capitalize}?" }, method: :delete \ No newline at end of file From 3316ccb7bcfbda1b4230b7dc42eef25b63247d3e Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 19:06:26 +0100 Subject: [PATCH 03/15] fix indentation --- app/views/services/index.html.haml | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index 481be62f..2ab23b45 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -6,12 +6,6 @@ .panel-body - if @services.count > 0 Sharing is enabled for the following services: - %ul.list-group - - @services.each do |service| - %li.list-group-item - %strong= service.provider.capitalize - (#{service.nickname}) - = link_to 'Disconnect', service_path(service), data: { confirm: "Really disconnect service #{service.provider.capitalize}?" }, method: :delete - else You have not connected any services yet. @@ -19,12 +13,11 @@ - if service_options['enabled'] and !@services.any? { |x| x.provider == service.to_s } %p=link_to "Connect to #{service.capitalize}", "/auth/#{service}" - / Show the list-group here, because it perfectly aligns outside a panel-body - - if @services.count > 0 - %ul.list-group - - @services.each do |service| - %li.list-group-item - %i{class: "fa fa-#{service.provider}"} - %strong= service.provider.capitalize - (#{service.nickname}) - = link_to 'Disconnect', service_path(service), data: { confirm: "Really disconnect service #{service.provider.capitalize}?" }, method: :delete \ No newline at end of file + - if @services.count > 0 + %ul.list-group + - @services.each do |service| + %li.list-group-item + %i{class: "fa fa-#{service.provider}"} + %strong= service.provider.capitalize + (#{service.nickname}) + = link_to 'Disconnect', service_path(service), data: { confirm: "Really disconnect service #{service.provider.capitalize}?" }, method: :delete \ No newline at end of file From 14eb6b035b9f8d922d4cf2cb0a7b9cbb4d916721 Mon Sep 17 00:00:00 2001 From: nilsding Date: Tue, 13 Jan 2015 19:49:43 +0100 Subject: [PATCH 04/15] Revert "got rid of nprogress" This reverts commit 3574993746dacaa5740145abd21221fd469cf084. --- Gemfile | 1 + Gemfile.lock | 2 ++ app/assets/javascripts/application.js.erb.coffee | 5 ++++- app/assets/stylesheets/application.css.scss | 8 +++----- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index d5ac1fad..6d635877 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,7 @@ gem 'devise' gem 'devise-async' gem 'bootstrap_form' gem 'font-kit-rails' +gem 'nprogress-rails' gem 'font-awesome-rails', '~> 4.2.0.0' gem 'rails-assets-growl' gem "paperclip", "~> 4.2" diff --git a/Gemfile.lock b/Gemfile.lock index 2558c5a5..b76ce586 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,6 +165,7 @@ GEM mini_portile (~> 0.6.0) nokogumbo (1.2.0) nokogiri + nprogress-rails (0.1.6.3) oauth (0.4.7) omniauth (1.2.2) hashie (>= 1.2, < 4) @@ -378,6 +379,7 @@ DEPENDENCIES jquery-rails jquery-turbolinks mysql2 + nprogress-rails omniauth omniauth-tumblr omniauth-twitter diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee index 608983d5..5842510d 100644 --- a/app/assets/javascripts/application.js.erb.coffee +++ b/app/assets/javascripts/application.js.erb.coffee @@ -3,13 +3,16 @@ #= require jquery.turbolinks #= require turbolinks #= require bootstrap +#= require nprogress +#= require nprogress-turbolinks #= require growl #= require cheet #= require jquery.guillotine #= require sweet-alert #= require_tree . -Turbolinks.enableProgressBar() +NProgress.configure + showSpinner: false window.showNotification = (text, success=true) -> args = diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 06528d5e..e43fa907 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -34,8 +34,6 @@ body { padding-top: $navbar-height; } @import "font-awesome"; -html.turbolinks-progress-bar::before { - background-color: darken($navbar-inverse-bg, 15%) !important; - box-shadow: 0px 0px 10px darken($navbar-inverse-bg, 15%), 0px 0px 5px darken($navbar-inverse-bg, 15%); - height: 2px !important; -} +$nprogress-color: darken($navbar-inverse-bg, 15%); +@import 'nprogress'; +@import 'nprogress-bootstrap'; From c1e6945bff7f24d7c05a993ef8be26abebfd0669 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 21:27:39 +0100 Subject: [PATCH 05/15] cool new navbar colours --- app/assets/stylesheets/application.css.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 06528d5e..6d7ff146 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -39,3 +39,18 @@ html.turbolinks-progress-bar::before { box-shadow: 0px 0px 10px darken($navbar-inverse-bg, 15%), 0px 0px 5px darken($navbar-inverse-bg, 15%); height: 2px !important; } + +$navbar-default-bg: #5e35b1; +$navbar-default-link-color: #ffffff; +$navbar-default-link-hover-color: #bfbfbf; +$navbar-default-link-hover-bg: transparent; +$navbar-default-link-active-color: #bfbfbf; +$navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%); +$navbar-default-link-disabled-color: darken(#fff, 12.5%); +$navbar-default-link-disabled-bg: transparent; +$navbar-default-brand-color: $navbar-default-link-color; +$navbar-default-brand-hover-color: darken($navbar-default-link-color, 10%); +$navbar-default-brand-hover-bg: transparent; +$navbar-default-toggle-hover-bg: #512da8; +$navbar-default-toggle-icon-bar-bg: #7e57c2; +$navbar-default-toggle-border-color: #512da8; From 40a5689a4bba1ff15476c2fa7414a113b10cbd0e Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 21:53:47 +0100 Subject: [PATCH 06/15] cool new navbar colours --- app/assets/stylesheets/application.css.scss | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 6d7ff146..d4d06f1b 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -40,17 +40,17 @@ html.turbolinks-progress-bar::before { height: 2px !important; } -$navbar-default-bg: #5e35b1; -$navbar-default-link-color: #ffffff; -$navbar-default-link-hover-color: #bfbfbf; -$navbar-default-link-hover-bg: transparent; -$navbar-default-link-active-color: #bfbfbf; -$navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%); -$navbar-default-link-disabled-color: darken(#fff, 12.5%); -$navbar-default-link-disabled-bg: transparent; -$navbar-default-brand-color: $navbar-default-link-color; -$navbar-default-brand-hover-color: darken($navbar-default-link-color, 10%); -$navbar-default-brand-hover-bg: transparent; -$navbar-default-toggle-hover-bg: #512da8; -$navbar-default-toggle-icon-bar-bg: #7e57c2; -$navbar-default-toggle-border-color: #512da8; +$navbar-inverse-bg: #5e35b1; +$navbar-inverse-link-color: #ffffff; +$navbar-inverse-link-hover-color: #bfbfbf; +$navbar-inverse-link-hover-bg: transparent; +$navbar-inverse-link-active-color: #bfbfbf; +$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 6.5%); +$navbar-inverse-link-disabled-color: darken(#fff, 12.5%); +$navbar-inverse-link-disabled-bg: transparent; +$navbar-inverse-brand-color: $navbar-inverse-link-color; +$navbar-inverse-brand-hover-color: darken($navbar-inverse-link-color, 10%); +$navbar-inverse-brand-hover-bg: transparent; +$navbar-inverse-toggle-hover-bg: #512da8; +$navbar-inverse-toggle-icon-bar-bg: #7e57c2; +$navbar-inverse-toggle-border-color: #512da8; From 0ee58e0d2062389a1fe394ad084870a5197e231e Mon Sep 17 00:00:00 2001 From: nilsding Date: Tue, 13 Jan 2015 21:54:56 +0100 Subject: [PATCH 07/15] it doesn't make much sense changing the variables after loading bootstrap --- app/assets/stylesheets/application.css.scss | 29 +++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index d4d06f1b..f69fbbdf 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -26,20 +26,6 @@ $font-size-h4: ceil(($font-size-base * 1.25)); // ~18px $font-size-h5: $font-size-base; $font-size-h6: ceil(($font-size-base * 0.85)); // ~12px -@import "bootstrap"; -body { padding-top: $navbar-height; } -@import "bootswatch/paper/bootswatch"; - -@import "base"; - -@import "font-awesome"; - -html.turbolinks-progress-bar::before { - background-color: darken($navbar-inverse-bg, 15%) !important; - box-shadow: 0px 0px 10px darken($navbar-inverse-bg, 15%), 0px 0px 5px darken($navbar-inverse-bg, 15%); - height: 2px !important; -} - $navbar-inverse-bg: #5e35b1; $navbar-inverse-link-color: #ffffff; $navbar-inverse-link-hover-color: #bfbfbf; @@ -54,3 +40,18 @@ $navbar-inverse-brand-hover-bg: transparent; $navbar-inverse-toggle-hover-bg: #512da8; $navbar-inverse-toggle-icon-bar-bg: #7e57c2; $navbar-inverse-toggle-border-color: #512da8; + +@import "bootstrap"; +body { padding-top: $navbar-height; } +@import "bootswatch/paper/bootswatch"; + +@import "base"; + +@import "font-awesome"; + +html.turbolinks-progress-bar::before { + background-color: darken($navbar-inverse-bg, 15%) !important; + box-shadow: 0px 0px 10px darken($navbar-inverse-bg, 15%), 0px 0px 5px darken($navbar-inverse-bg, 15%); + height: 2px !important; +} + From e834a1ae29d6a79c235a497aa81fff44c0f3ed45 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 22:03:43 +0100 Subject: [PATCH 08/15] change the primary color to purple --- app/assets/stylesheets/application.css.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index e90b9c52..10924bf8 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -26,6 +26,8 @@ $font-size-h4: ceil(($font-size-base * 1.25)); // ~18px $font-size-h5: $font-size-base; $font-size-h6: ceil(($font-size-base * 0.85)); // ~12px +$brand-primary: #5e35b1; + $navbar-inverse-bg: #5e35b1; $navbar-inverse-link-color: #ffffff; $navbar-inverse-link-hover-color: #bfbfbf; From bb7cb3ded05ae20a76e4442db560640ab682b56c Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 22:10:45 +0100 Subject: [PATCH 09/15] change the primary color to purple --- app/assets/stylesheets/application.css.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 10924bf8..54a3ff55 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -26,8 +26,6 @@ $font-size-h4: ceil(($font-size-base * 1.25)); // ~18px $font-size-h5: $font-size-base; $font-size-h6: ceil(($font-size-base * 0.85)); // ~12px -$brand-primary: #5e35b1; - $navbar-inverse-bg: #5e35b1; $navbar-inverse-link-color: #ffffff; $navbar-inverse-link-hover-color: #bfbfbf; @@ -54,3 +52,5 @@ body { padding-top: $navbar-height; } $nprogress-color: darken($navbar-inverse-bg, 15%); @import 'nprogress'; @import 'nprogress-bootstrap'; + +$brand-primary: #5e35b1; From 20f01094b5374427b9edede57e351d51454202e4 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 22:15:18 +0100 Subject: [PATCH 10/15] stupid overrides --- app/assets/stylesheets/application.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 54a3ff55..870bbf33 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -53,4 +53,4 @@ $nprogress-color: darken($navbar-inverse-bg, 15%); @import 'nprogress'; @import 'nprogress-bootstrap'; -$brand-primary: #5e35b1; +$brand-primary: #5e35b1 !default; From 9e1de238da532ae7e3d252690ad77b45e61231c6 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 22:32:23 +0100 Subject: [PATCH 11/15] please --- app/assets/stylesheets/application.css.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 870bbf33..155a6816 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -40,6 +40,7 @@ $navbar-inverse-brand-hover-bg: transparent; $navbar-inverse-toggle-hover-bg: #512da8; $navbar-inverse-toggle-icon-bar-bg: #7e57c2; $navbar-inverse-toggle-border-color: #512da8; +$brand-primary: #5e35b1 !default; @import "bootstrap"; body { padding-top: $navbar-height; } @@ -52,5 +53,3 @@ body { padding-top: $navbar-height; } $nprogress-color: darken($navbar-inverse-bg, 15%); @import 'nprogress'; @import 'nprogress-bootstrap'; - -$brand-primary: #5e35b1 !default; From 1c4072168825ff58b2f5c85ed324ed8d98dde512 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 22:34:48 +0100 Subject: [PATCH 12/15] hopefully --- app/assets/stylesheets/application.css.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 155a6816..bda72d99 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -40,7 +40,6 @@ $navbar-inverse-brand-hover-bg: transparent; $navbar-inverse-toggle-hover-bg: #512da8; $navbar-inverse-toggle-icon-bar-bg: #7e57c2; $navbar-inverse-toggle-border-color: #512da8; -$brand-primary: #5e35b1 !default; @import "bootstrap"; body { padding-top: $navbar-height; } @@ -53,3 +52,5 @@ body { padding-top: $navbar-height; } $nprogress-color: darken($navbar-inverse-bg, 15%); @import 'nprogress'; @import 'nprogress-bootstrap'; + +$brand-primary: #5e35b1; \ No newline at end of file From 1b0b505ec9ef160c3f6658c27d4c256ed82e252b Mon Sep 17 00:00:00 2001 From: Andreas N Date: Tue, 13 Jan 2015 22:37:02 +0100 Subject: [PATCH 13/15] another try --- app/assets/stylesheets/application.css.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index bda72d99..2757914b 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -26,6 +26,7 @@ $font-size-h4: ceil(($font-size-base * 1.25)); // ~18px $font-size-h5: $font-size-base; $font-size-h6: ceil(($font-size-base * 0.85)); // ~12px +$brand-primary: #5e35b1; $navbar-inverse-bg: #5e35b1; $navbar-inverse-link-color: #ffffff; $navbar-inverse-link-hover-color: #bfbfbf; @@ -51,6 +52,4 @@ body { padding-top: $navbar-height; } $nprogress-color: darken($navbar-inverse-bg, 15%); @import 'nprogress'; -@import 'nprogress-bootstrap'; - -$brand-primary: #5e35b1; \ No newline at end of file +@import 'nprogress-bootstrap'; \ No newline at end of file From 5f3feaa4e6b5f65e672b17b2828b1fe02ba66ce7 Mon Sep 17 00:00:00 2001 From: nilsding Date: Tue, 13 Jan 2015 22:55:45 +0100 Subject: [PATCH 14/15] =?UTF-8?q?MAXIMUM=20SASS=E2=84=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/application.css.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 2757914b..515ab0cc 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -7,12 +7,11 @@ */ @import url(https://fonts.googleapis.com/css?family=Exo+2:400,700); -@import "bootswatch/paper/variables"; $font-family-sans-serif: "Exo 2","Open Sans", "Helvetica Neue", Helvetica, "DejaVu Sans", Arial, sans-serif; $font-family-serif: Georgia, "DejaVu Serif", "Times New Roman", Times, serif; //** Default monospace fonts for ``, ``, and `
`.
-$font-family-monospace:   Monaco, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace;
+$font-family-monospace:   "PragmataPro", Monaco, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace;
 $font-family-base:        $font-family-sans-serif;
 
 $font-size-base:          14px;
@@ -42,6 +41,8 @@ $navbar-inverse-toggle-hover-bg: #512da8;
 $navbar-inverse-toggle-icon-bar-bg: #7e57c2;
 $navbar-inverse-toggle-border-color: #512da8;
 
+@import "bootswatch/paper/variables";
+
 @import "bootstrap";
 body { padding-top: $navbar-height; }
 @import "bootswatch/paper/bootswatch";
@@ -52,4 +53,4 @@ body { padding-top: $navbar-height; }
 
 $nprogress-color: darken($navbar-inverse-bg, 15%);
 @import 'nprogress';
-@import 'nprogress-bootstrap';
\ No newline at end of file
+@import 'nprogress-bootstrap';

From f350f2806a2f33bad643e12166f47daf083bd4d9 Mon Sep 17 00:00:00 2001
From: Andreas N 
Date: Tue, 13 Jan 2015 22:57:50 +0100
Subject: [PATCH 15/15] change theme-color

---
 app/views/layouts/application.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index b72d3d52..807074a4 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -4,7 +4,7 @@
     %meta{charset: 'utf-8'}
     %meta{'http-equiv' => 'X-UA-Compatible' ,content: 'IE=edge'}
     %meta{name: 'viewport', content: 'width=device-width, initial-scale=1, user-scalable=no'}
-    %meta{name: 'theme-color', content: '#0C84E4'}
+    %meta{name: 'theme-color', content: '#5e35b1'}
     %meta{name: "mobile-web-app-capable", content: "yes"}
     %meta{name: "apple-mobile-web-app-capable", content: "yes"}
     %meta{name: 'apple-mobile-web-app-status-bar-style', content: 'black-translucent'}