From 550bb99172cb115f592abc3b42e6b7b33a216ebb Mon Sep 17 00:00:00 2001 From: Sarbik Betal Date: Sat, 5 Jan 2019 02:54:40 +0530 Subject: [PATCH 1/9] Worked on Navbar and nav Drawer --- Gemfile | 6 +- Gemfile.lock | 30 +-- app/assets/javascripts/application.js | 1 - app/assets/stylesheets/conversations.scss | 3 - app/assets/stylesheets/custom.scss | 256 ---------------------- app/assets/stylesheets/messages.scss | 3 - app/assets/stylesheets/projects.scss | 3 - app/assets/stylesheets/sessions.scss | 3 - app/assets/stylesheets/static_pages.scss | 3 - app/assets/stylesheets/styles.css | 9 + app/assets/stylesheets/users.scss | 3 - app/views/layouts/application.html.erb | 124 ++++++----- 12 files changed, 98 insertions(+), 346 deletions(-) delete mode 100644 app/assets/stylesheets/conversations.scss delete mode 100644 app/assets/stylesheets/custom.scss delete mode 100644 app/assets/stylesheets/messages.scss delete mode 100644 app/assets/stylesheets/projects.scss delete mode 100644 app/assets/stylesheets/sessions.scss delete mode 100644 app/assets/stylesheets/static_pages.scss create mode 100644 app/assets/stylesheets/styles.css delete mode 100644 app/assets/stylesheets/users.scss diff --git a/Gemfile b/Gemfile index 5240bfe..b5e6ed9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,11 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.4.1' +ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' -gem 'bootstrap-sass', '~> 3.3.7' +# gem 'bootstrap-sass', '~> 3.3.7' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Puma as the app server @@ -66,6 +66,6 @@ end gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] group :production do - gem 'pg', '0.20.0' +# gem 'pg', '0.20.0' gem 'fog', '1.42' end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index fa4d619..465c05c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,15 +48,10 @@ GEM archive-zip (0.11.0) io-like (~> 0.3.0) arel (9.0.0) - autoprefixer-rails (9.1.3) - execjs bcrypt (3.1.12) bindex (0.5.0) bootsnap (1.3.2) msgpack (~> 1.0) - bootstrap-sass (3.3.7) - autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) bootstrap-will_paginate (1.0.0) will_paginate builder (3.2.3) @@ -85,12 +80,12 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.4) crass (1.0.4) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) dry-inflector (0.1.2) - erubi (1.7.1) + erubi (1.8.0) excon (0.62.0) execjs (2.7.0) ffi (1.9.25) @@ -255,7 +250,7 @@ GEM activesupport (>= 4.2.0) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.1.1) + i18n (1.4.0) concurrent-ruby (~> 1.0) io-like (0.3.0) ipaddress (0.8.3) @@ -282,20 +277,19 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mimemagic (0.3.2) + mimemagic (0.3.3) mini_magick (4.9.2) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.2.4) multi_json (1.13.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.9.1) + mini_portile2 (~> 2.4.0) ovirt-engine-sdk (4.2.5) json (>= 1, < 3) - pg (0.20.0) public_suffix (3.0.3) puma (3.12.0) rack (2.0.6) @@ -327,8 +321,8 @@ GEM thor (>= 0.19.0, < 2.0) rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) rbovirt (0.1.7) nokogiri rest-client (> 1.7.0) @@ -405,7 +399,6 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) bootsnap (>= 1.1.0) - bootstrap-sass (~> 3.3.7) bootstrap-will_paginate (= 1.0.0) byebug capybara (>= 2.15) @@ -417,7 +410,6 @@ DEPENDENCIES jquery-rails listen (>= 3.0.5, < 3.2) mini_magick (~> 4.8) - pg (= 0.20.0) puma (~> 3.11) rails (~> 5.2.1) sass-rails (~> 5.0) @@ -432,7 +424,7 @@ DEPENDENCIES will_paginate (= 3.1.6) RUBY VERSION - ruby 2.4.1p111 + ruby 2.5.1p57 BUNDLED WITH - 1.16.2 + 2.0.1 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b8866b5..5634835 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,6 @@ // //= require jquery //= require jquery_ujs -//= require bootstrap //= require rails-ujs //= require activestorage //= require turbolinks diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss deleted file mode 100644 index 39d45bf..0000000 --- a/app/assets/stylesheets/conversations.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Conversations controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss deleted file mode 100644 index 2927b7b..0000000 --- a/app/assets/stylesheets/custom.scss +++ /dev/null @@ -1,256 +0,0 @@ -@import "bootstrap-sprockets"; -@import "bootstrap"; - -/* universal */ - -body { - padding-top: 60px; -} - -section { - overflow: auto; -} - -textarea { - resize: vertical; -} - -.center { - text-align: center; -} - -.center h1 { - margin-bottom: 10px; -} - - -/* typography */ - -h1, h2, h3, h4, h5, h6 { - line-height: 1; -} - -h1 { - font-size: 3em; - letter-spacing: -2px; - margin-bottom: 30px; - text-align: center; -} - -h2 { - font-size: 1.2em; - letter-spacing: -1px; - margin-bottom: 30px; - text-align: center; - font-weight: normal; - color: #777; -} - -p { - font-size: 1.1em; - line-height: 1.7em; -} - - -/* header */ - -#logo { - float: left; - margin-right: 10px; - font-size: 1.7em; - color: #fff; - text-transform: uppercase; - letter-spacing: -1px; - padding-top: 9px; - font-weight: bold; -} - -#logo:hover { - color: #fff; - text-decoration: none; -} - -/* footer */ - -footer { - margin-top: 45px; - padding-top: 5px; - border-top: 1px solid #eaeaea; - color: #777; -} - -footer a { - color: #555; -} - -footer a:hover { - color: #222; -} - -footer small { - float: left; -} - -footer ul { - float: right; - list-style: none; -} - -footer ul li { - float: left; - margin-left: 15px; -} - - -/* sidebar */ - -aside { - section.user_info { - margin-top: 20px; - } - section { - padding: 10px 0; - margin-top: 20px; - &:first-child { - border: 0; - padding-top: 0; - } - span { - display: block; - margin-bottom: 3px; - line-height: 1; - } - h1 { - font-size: 1.4em; - text-align: left; - letter-spacing: -1px; - margin-bottom: 3px; - margin-top: 0px; - } - } -} - -.gravatar { - float: left; - margin-right: 10px; -} - -.gravatar_edit { - margin-top: 15px; -} - -/* forms */ - -input, textarea, select, .uneditable-input { - border: 1px solid #bbb; - width: 100%; - margin-bottom: 15px; - -} - -input { - height: auto !important; -} - -#error_explanation { - color: red; - ul { - color: red; - margin: 0 0 30px 0; - } -} - -.field_with_errors { - @extend .has-error; - .form-control { - color: $state-danger-text; - } -} - -/* Users index */ - -.users { - list-style: none; - margin: 0; - li { - overflow: auto; - padding: 10px 0; - border-bottom: 1px solid $gray-lighter; - } -} - -/* projects */ - -.projects { - list-style: none; - padding: 0; - li { - padding: 10px 0; - border-top: 1px solid #e8e8e8; - } - .user { - margin-top: 5em; - padding-top: 0; - } - .content { - display: block; - margin-left: 60px; - img { - display: block; - padding: 5px 0; - } - } - .timestamp { - color: $gray-light; - display: block; - margin-left: 60px; - } - .gravatar { - float: left; - margin-right: 10px; - margin-top: 5px; - } -} - -aside { - textarea { - height: 100px; - margin-bottom: 5px; - } -} - -span.picture { - margin-top: 10px; - input { - border: 0; - } -} - -ul { - padding-left: 0px; - list-style: none; -} - -.messages-list { - max-height: 200px; - overflow-y: auto; - overflow-x: hidden; -} - -.message-sent { - position: relative; - background-color: #D9EDF7; - border-color: #BCE8F1; - margin: 5px 20px; - padding: 10px; - float: right; -} - - -.message-received { - background-color: #F1F0F0; - border-color: #EEEEEE; - margin: 5px 20px; - padding: 10px; - float: left; -} \ No newline at end of file diff --git a/app/assets/stylesheets/messages.scss b/app/assets/stylesheets/messages.scss deleted file mode 100644 index 492f0fa..0000000 --- a/app/assets/stylesheets/messages.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Messages controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss deleted file mode 100644 index 7b9c6ec..0000000 --- a/app/assets/stylesheets/projects.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Projects controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss deleted file mode 100644 index ccb1ed2..0000000 --- a/app/assets/stylesheets/sessions.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Sessions controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/static_pages.scss b/app/assets/stylesheets/static_pages.scss deleted file mode 100644 index d55836c..0000000 --- a/app/assets/stylesheets/static_pages.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the StaticPages controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/styles.css b/app/assets/stylesheets/styles.css new file mode 100644 index 0000000..55958e2 --- /dev/null +++ b/app/assets/stylesheets/styles.css @@ -0,0 +1,9 @@ +.dropdown-menu-right.show { + left: -128px; +} + +@media only screen and (min-width: 768px) { + .sn-btn { + visibility: hidden; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss deleted file mode 100644 index 31a2eac..0000000 --- a/app/assets/stylesheets/users.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Users controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8351f43..eb7120d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,68 +4,94 @@ Robodarshan <%= csrf_meta_tags %> <%= csp_meta_tag %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + - -