From 4a6524d8728330c5ca25a4b91ff7edff6e051151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CSeregey?= Date: Mon, 12 Mar 2018 18:04:41 +0600 Subject: [PATCH 1/7] add layout for related theme page --- .idea/.generators | 8 + .idea/.rakeTasks | 7 + .idea/codeStyleSettings.xml | 17 + .idea/inspectionProfiles/Project_Default.xml | 6 + .idea/lc3-trial.iml | 32 + .idea/misc.xml | 4 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 674 +++++++++++++++++++ Gemfile.lock | 2 +- app/assets/stylesheets/application.scss | 1 + app/assets/stylesheets/views/_base.scss | 11 + app/assets/stylesheets/views/cards.scss | 52 ++ app/assets/stylesheets/views/closed-box.scss | 11 + app/assets/stylesheets/views/controls.scss | 15 + app/assets/stylesheets/views/filter-box.scss | 8 + app/assets/stylesheets/views/lists.scss | 43 ++ app/assets/stylesheets/views/main.scss | 3 + app/assets/stylesheets/views/modal.scss | 75 +++ app/assets/stylesheets/views/related.scss | 15 + app/assets/stylesheets/views/remark.scss | 11 + app/assets/stylesheets/views/sidebar.scss | 7 + app/assets/stylesheets/views/theme-box.scss | 22 + app/views/application/index.html.haml | 121 +++- app/views/layouts/application.html.haml | 2 + 25 files changed, 1157 insertions(+), 4 deletions(-) create mode 100644 .idea/.generators create mode 100644 .idea/.rakeTasks create mode 100644 .idea/codeStyleSettings.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/lc3-trial.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 app/assets/stylesheets/views/_base.scss create mode 100644 app/assets/stylesheets/views/cards.scss create mode 100644 app/assets/stylesheets/views/closed-box.scss create mode 100644 app/assets/stylesheets/views/controls.scss create mode 100644 app/assets/stylesheets/views/filter-box.scss create mode 100644 app/assets/stylesheets/views/lists.scss create mode 100644 app/assets/stylesheets/views/main.scss create mode 100644 app/assets/stylesheets/views/modal.scss create mode 100644 app/assets/stylesheets/views/related.scss create mode 100644 app/assets/stylesheets/views/remark.scss create mode 100644 app/assets/stylesheets/views/sidebar.scss create mode 100644 app/assets/stylesheets/views/theme-box.scss diff --git a/.idea/.generators b/.idea/.generators new file mode 100644 index 0000000..1618976 --- /dev/null +++ b/.idea/.generators @@ -0,0 +1,8 @@ + + diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks new file mode 100644 index 0000000..c6865d9 --- /dev/null +++ b/.idea/.rakeTasks @@ -0,0 +1,7 @@ + + diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml new file mode 100644 index 0000000..9d847e9 --- /dev/null +++ b/.idea/codeStyleSettings.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..b0db9b0 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/lc3-trial.iml b/.idea/lc3-trial.iml new file mode 100644 index 0000000..c261e95 --- /dev/null +++ b/.idea/lc3-trial.iml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..9132694 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..8350c4a --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..d080a36 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,674 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5a5a5a + #49acf9 + bor + 1293f6 + card + list + modal + .col-sm-8 + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -427,35 +439,36 @@ - - + - - - - + - + + + + @@ -469,11 +482,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -489,7 +589,6 @@ - @@ -521,18 +620,10 @@ - - - - - - - - - + @@ -541,130 +632,129 @@ - + - - + + - + - - + + - + - - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + diff --git a/app/assets/stylesheets/views/controls.scss b/app/assets/stylesheets/views/controls.scss index 8fa0131..a4eb86e 100644 --- a/app/assets/stylesheets/views/controls.scss +++ b/app/assets/stylesheets/views/controls.scss @@ -11,5 +11,16 @@ $block: '.btn'; background: #ff6967; color: $white; } + &_close{ + position: absolute; + background: transparent; + padding: 0; + top: 3px; + right: 10px; + font-size: 24px; + font-weight: 600; + transform: rotate(45deg); + color: #c8c8c8; + } } } \ No newline at end of file diff --git a/app/assets/stylesheets/views/lists.scss b/app/assets/stylesheets/views/lists.scss index 04098b7..acdd118 100644 --- a/app/assets/stylesheets/views/lists.scss +++ b/app/assets/stylesheets/views/lists.scss @@ -13,7 +13,7 @@ $block: '.list'; margin-bottom: 6px; margin-top: 4px; padding: 2px 8px; - background: $text-color; + background: #9a9b9b; } label{ cursor: pointer; diff --git a/app/assets/stylesheets/views/modal.scss b/app/assets/stylesheets/views/modal.scss index d83e43d..b123e7a 100644 --- a/app/assets/stylesheets/views/modal.scss +++ b/app/assets/stylesheets/views/modal.scss @@ -69,6 +69,26 @@ $block: '.modal'; text-align: center; font-weight: 600; } + &.modal_access-small{ + #{$block}{ + &__content{ + max-width: 98%; + top: 83px; + padding-top: 0; + padding-bottom: 20px; + } + &__image{ + margin-bottom: 0; + width: 130px; + } + &__controls{ + margin-bottom: 0; + } + } + .remark{ + font-size: 18px; + } + } } } } diff --git a/app/assets/stylesheets/views/sidebar.scss b/app/assets/stylesheets/views/sidebar.scss index db1f004..45c6523 100644 --- a/app/assets/stylesheets/views/sidebar.scss +++ b/app/assets/stylesheets/views/sidebar.scss @@ -1,7 +1,27 @@ $block: '.sidebar'; #{$block}{ + position: relative; @media(max-width: 767px) { display: none; } + &__header{ + display: flex; + position: relative; + } + &__title{ + font-size: 18px; + font-weight: 600; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 100%; + padding-right: 16px; + } + &__image{ + position: absolute; + right: 0; + top: -22px; + width: 36px; + } } diff --git a/app/views/application/index.html.haml b/app/views/application/index.html.haml index 23f7123..c3fe270 100644 --- a/app/views/application/index.html.haml +++ b/app/views/application/index.html.haml @@ -3,9 +3,25 @@ .row .col-xs-12.col-sm-4.col-md-3.col-lg-3 .sidebar - .title - Refine Your Search - = image_tag 'https://assets.litcharts.com/assets/sign-up/icons/A-plus-letter-emblem-998845222a2401b3e06baaf01b08575ddd08e9db9393531fb51c9fd12180e456.svg', class: 'a-plus-icon', alt: "A plus letter emblem." + .sidebar__header + .sidebar__title + Refine Your Search + .sidebar__image + = image_tag 'https://assets.litcharts.com/assets/sign-up/icons/A-plus-letter-emblem-998845222a2401b3e06baaf01b08575ddd08e9db9393531fb51c9fd12180e456.svg', class: 'a-plus-icon img-responsive', alt: "A plus letter emblem." + .modal.modal_access.modal_access-small.modal_open + .modal__content + %button.btn.btn_close + + + .modal__header + .modal__image + = image_tag 'https://assets.litcharts.com/assets/logo-books-and-text-blue-a-plus-b6b70c7593564a0e3ccf2bb702af3d2fdeb9d10d16cf075897c01d21dc742884.svg', class: 'img-responsive', alt: 'Logo books and text blue a plus' + .modal__body + .remark + Upgrade to
refine your search + .modal__footer + .modal__controls + %button.btn.btn_action + get LitCarts A+ .filter-box %ul.list.list_checkbox .header.lit-guides Book title (66) @@ -15,19 +31,67 @@ %input{ type: "checkbox" } A Walk to Remember %span.count + %li.list__item + %label.subcategory + %span.checkbox-wrapper + %input{ type: "checkbox" } + A Walk to Remember + %span.count + %li.list__item + %label.subcategory + %span.checkbox-wrapper + %input{ type: "checkbox" } + A Walk to Remember + %span.count + %li.list__item + %label.subcategory + %span.checkbox-wrapper + %input{ type: "checkbox" } + A Walk to Remember + %span.count + %li.list__item + %label.subcategory + %span.checkbox-wrapper + %input{ type: "checkbox" } + A Walk to Remember + %span.count %span.ital = link_to '(see more)', '#', class: 'link' .filter-box %ul.list.list_checkbox - .header.lit-guides Author (17) + .header.lit-guides Book title (66) %li.list__item %label.subcategory %span.checkbox-wrapper %input{ type: "checkbox" } - Arthur Miller - %span.count  (3) - %span.ital - = link_to '(see more)', '#', class: 'link' + A Walk to Remember + %span.count + %li.list__item + %label.subcategory + %span.checkbox-wrapper + %input{ type: "checkbox" } + A Walk to Remember + %span.count + %li.list__item + %label.subcategory + %span.checkbox-wrapper + %input{ type: "checkbox" } + A Walk to Remember + %span.count + %li.list__item + %label.subcategory + %span.checkbox-wrapper + %input{ type: "checkbox" } + A Walk to Remember + %span.count + %li.list__item + %label.subcategory + %span.checkbox-wrapper + %input{ type: "checkbox" } + A Walk to Remember + %span.count + %span.ital + = link_to '(see more)', '#', class: 'link' .col-xs-12.col-sm-8.col-md-8.col-lg-8 .theme-box .theme-box__header From 552e8753271af41e2e56de886c265ca303086899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CSeregey?= Date: Tue, 13 Mar 2018 17:03:16 +0600 Subject: [PATCH 4/7] remove .idea folder add it to gitignore --- .gitignore | 2 + .idea/.generators | 8 - .idea/.rakeTasks | 7 - .idea/codeStyleSettings.xml | 17 - .idea/inspectionProfiles/Project_Default.xml | 6 - .idea/lc3-trial.iml | 32 - .idea/misc.xml | 4 - .idea/modules.xml | 8 - .idea/vcs.xml | 6 - .idea/workspace.xml | 763 ------------------- 10 files changed, 2 insertions(+), 851 deletions(-) delete mode 100644 .idea/.generators delete mode 100644 .idea/.rakeTasks delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/lc3-trial.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore index 3a5e762..d284dc8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,7 @@ /log/* !/log/.keep /tmp +.idea + config/database.yml diff --git a/.idea/.generators b/.idea/.generators deleted file mode 100644 index 1618976..0000000 --- a/.idea/.generators +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks deleted file mode 100644 index c6865d9..0000000 --- a/.idea/.rakeTasks +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 9d847e9..0000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index b0db9b0..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/lc3-trial.iml b/.idea/lc3-trial.iml deleted file mode 100644 index c261e95..0000000 --- a/.idea/lc3-trial.iml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 9132694..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 8350c4a..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index f63fbf5..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,763 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5a5a5a - #49acf9 - bor - 1293f6 - card - list - modal - .col-sm-8 - card__icon - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -