From 4fa5f3c2927b1ddb71942470d5e5b550fe31da35 Mon Sep 17 00:00:00 2001 From: Ignacio Galindo Date: Wed, 31 Aug 2016 13:44:01 +0200 Subject: [PATCH 1/4] Center login links in admin --- app/assets/stylesheets/admin.css.sass | 7 ------ app/assets/stylesheets/admin.css.scss | 8 ++++++ app/assets/stylesheets/admin/sessions.scss | 29 ++++++++++++++++++++++ app/views/admin/sessions/new.html.slim | 10 ++++---- 4 files changed, 42 insertions(+), 12 deletions(-) delete mode 100644 app/assets/stylesheets/admin.css.sass create mode 100644 app/assets/stylesheets/admin.css.scss create mode 100644 app/assets/stylesheets/admin/sessions.scss diff --git a/app/assets/stylesheets/admin.css.sass b/app/assets/stylesheets/admin.css.sass deleted file mode 100644 index e3ed98e..0000000 --- a/app/assets/stylesheets/admin.css.sass +++ /dev/null @@ -1,7 +0,0 @@ -/* - *= require_self - */ - -@import "bootstrap-sprockets" -@import "bootstrap" -@import "font-awesome" diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss new file mode 100644 index 0000000..c862769 --- /dev/null +++ b/app/assets/stylesheets/admin.css.scss @@ -0,0 +1,8 @@ +/* + *= require_tree ./admin + *= require_self + */ + +@import "bootstrap-sprockets"; +@import "bootstrap"; +@import "font-awesome"; diff --git a/app/assets/stylesheets/admin/sessions.scss b/app/assets/stylesheets/admin/sessions.scss new file mode 100644 index 0000000..80d2706 --- /dev/null +++ b/app/assets/stylesheets/admin/sessions.scss @@ -0,0 +1,29 @@ +#sessions { + + &.new { + + .panel { + margin: 15% auto 0 auto; + width: 350px; + + .panel-heading { + h3 { + text-align: center; + } + } + + .panel-body { + .oauth-providers { + display: flex; + + a { + flex-grow: 1; + margin: 0 15px; + width: 100px; + } + } + } + } + + } +} diff --git a/app/views/admin/sessions/new.html.slim b/app/views/admin/sessions/new.html.slim index 44b9d06..8ccb5f2 100644 --- a/app/views/admin/sessions/new.html.slim +++ b/app/views/admin/sessions/new.html.slim @@ -1,10 +1,10 @@ -.row - .col-md-offset-4.col-md-4 style='margin-top: 15%' +#sessions.new + .row .panel.panel-default .panel-heading - h3 style='text-align: center' - = image_tag 'favicon.png', width: 35 + h3 + = image_tag('favicon.png', width: 35) | Iniciar sesión .panel-body - .col-md-offset-4.col-md-2 + .oauth-providers = render_login_links From d24564e1a533e348a27d3d524dd1d29ae381eaf4 Mon Sep 17 00:00:00 2001 From: Ignacio Galindo Date: Thu, 1 Sep 2016 12:05:18 +0200 Subject: [PATCH 2/4] Tweak configuration for codeclimate ratings analysis --- .codeclimate.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index b8f2cec..889250a 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -20,11 +20,8 @@ engines: ratings: enabled: true paths: - - Gemfile.lock - app/** - lib/** - - "**.js" - - "**.rb" exclude_paths: - app/assets/javascripts/admin.js - app/assets/javascripts/app.js From 79b88f38bb9d0b7a05f005578e9e96130267d7a5 Mon Sep 17 00:00:00 2001 From: Ignacio Galindo Date: Thu, 1 Sep 2016 13:24:27 +0200 Subject: [PATCH 3/4] Update codeclimate config to consider more files to rating Correct typo on coffeescript linter engine --- .codeclimate.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 889250a..2838ee0 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -2,7 +2,7 @@ engines: bundler-audit: enabled: true - coffelint: + coffeelint: enabled: true csslint: enabled: true @@ -22,6 +22,10 @@ engines: paths: - app/** - lib/** + - "**.rb" + - "**.js" + - "**.css" + - "**.coffee" exclude_paths: - app/assets/javascripts/admin.js - app/assets/javascripts/app.js From 4251de91226884a60e5ca1e20f47e189e0cfa394 Mon Sep 17 00:00:00 2001 From: Ignacio Galindo Date: Thu, 1 Sep 2016 13:34:08 +0200 Subject: [PATCH 4/4] Fix codeclimate rating paths --- .codeclimate.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 2838ee0..db3fa14 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -15,17 +15,14 @@ engines: languages: - ruby - javascript - rubocop: - enabled: true ratings: enabled: true paths: - - app/** - - lib/** + - "app/**/*" + - "lib/**/*" - "**.rb" - - "**.js" - - "**.css" - - "**.coffee" + rubocop: + enabled: true exclude_paths: - app/assets/javascripts/admin.js - app/assets/javascripts/app.js