From 383bfc8356d444cbed1dab7e5c1b3bb16becfdfd Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 21 Apr 2017 11:06:33 +0200 Subject: Client: responsive design --- client/src/sass/_variables.scss | 8 +++ client/src/sass/application.scss | 102 ++++++++++++++++++++------------ client/src/sass/pre-customizations.scss | 2 + 3 files changed, 73 insertions(+), 39 deletions(-) create mode 100644 client/src/sass/_variables.scss (limited to 'client/src/sass') diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss new file mode 100644 index 000000000..be57db304 --- /dev/null +++ b/client/src/sass/_variables.scss @@ -0,0 +1,8 @@ +$black-background: #1d2125; +$grey-background: #f6f2f2; + +$header-height: 60px; +$header-border-color: #e9eff6; + +$video-miniature-title-color: #16a2b7; +$video-miniature-other-infos: #686767; diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index df3ee6c20..25d79a0cb 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -1,44 +1,81 @@ @import '../../node_modules/video.js/dist/video-js.css'; -body { - padding: 20px; +[hidden] { + display: none !important; +} - @media screen and (max-width: 400px) { - padding: 3px; - } +input.readonly { + /* Force blank on readonly inputs */ + background-color: #fff !important; } -menu { - @media screen and (max-width: 600px) { - margin-right: 3px !important; - padding: 3px !important; - min-height: 400px !important; - } +.form-control, .btn { + border-radius: 0; +} - min-height: 600px; - margin-right: 20px; - border-right: 1px solid rgba(0, 0, 0, 0.2); +.glyphicon-black { + color: black; +} + +.header { + height: $header-height; - .panel-block:not(:last-child) { - border-bottom: 1px solid rgba(0, 0, 0, 0.1); + .search-col { + height: 100%; + margin-left: -15px; + padding: 0; } +} - .panel-button { - margin: 8px; - cursor: pointer; - transition: margin 0.2s; +.main-col { + padding: 0; - &:hover { - margin-left: 15px; + .main-row { + padding: 15px 30px; + + @media screen and (min-width: 1400px) { + padding: 15px 40px; } - a { - color: #333333; + @media screen and (min-width: 1600px) { + padding: 15px 50px; + } + + @media screen and (min-width: 1800px) { + padding: 15px 60px; } } +} - .glyphicon { - margin: 5px; +.title-menu-left { + height: calc(100vh - #{$header-height}); + padding-right: 0; + + .title-menu-left-block { + margin-left: -15px; + + &.menu { + height: 100%; + } + } + + #peertube-title { + background-color: #fff; + border-right: 2px solid $header-border-color; + font-size: 25px; + line-height: $header-height; + text-align: center; + margin-top: 0; + margin-bottom: 0; + + a { + color: inherit !important; + + &:hover { + color: inherit !important; + text-decoration: none !important; + } + } } } @@ -63,19 +100,6 @@ ng2-smart-table { } } -[hidden] { - display: none !important; -} - -input.readonly { - /* Force blank on readonly inputs */ - background-color: #fff !important; -} - -.glyphicon-black { - color: black; -} - footer { border-top: 1px solid rgba(0, 0, 0, 0.2); padding-top: 10px; diff --git a/client/src/sass/pre-customizations.scss b/client/src/sass/pre-customizations.scss index 0703b0c9a..693489828 100644 --- a/client/src/sass/pre-customizations.scss +++ b/client/src/sass/pre-customizations.scss @@ -1,3 +1,5 @@ +@import '_variables.scss'; + $bootstrap-sass-asset-helper: false !default; // // Variables -- cgit v1.2.3