Browse Source

Move devices styles

pull/600/head
Artur Arseniev 9 years ago
parent
commit
97165997e8
  1. 2
      dist/css/grapes.min.css
  2. 2
      src/editor/config/config.js
  3. 20
      src/styles/scss/_gjs_devices.scss
  4. 3
      src/styles/scss/_gjs_variables.scss
  5. 42
      src/styles/scss/main.scss

2
dist/css/grapes.min.css

File diff suppressed because one or more lines are too long

2
src/editor/config/config.js

@ -178,5 +178,5 @@ module.exports = {
// Texts // Texts
textViewCode: 'View Code', textViewCode: 'Code',
}; };

20
src/styles/scss/_gjs_devices.scss

@ -0,0 +1,20 @@
.#{$app-prefix}devices-c {
display: flex;
align-items: center;
padding: 3px;
.#{$app-prefix}device-label {
flex-grow: 2;
text-align: left;
margin-right: 10px;
}
.#{$app-prefix}select {
flex-grow: 20;
}
.#{$app-prefix}add-trasp {
flex-grow: 1;
margin-left: 5px;
}
}

3
src/styles/scss/_gjs_variables.scss

@ -40,7 +40,6 @@ $mainDklColor: rgba(0, 0, 0, 0.1) !default;
$mainLhColor: rgba(255, 255, 255, 0.1) !default; /* #515151 */ $mainLhColor: rgba(255, 255, 255, 0.1) !default; /* #515151 */
$mainLhlColor: rgba(255, 255, 255, 0.7) !default; $mainLhlColor: rgba(255, 255, 255, 0.7) !default;
$fontColorDk: #777 !default; $fontColorDk: #777 !default;
$mainFont: Helvetica, sans-serif !default;
$colorBlue: #3b97e3 !default; $colorBlue: #3b97e3 !default;
$colorRed: #dd3636 !default; $colorRed: #dd3636 !default;
$colorYell: #ffca6f !default; $colorYell: #ffca6f !default;
@ -77,6 +76,8 @@ $uploadPadding: 150px 10px !default;
$animSpeed: 0.2s !default; $animSpeed: 0.2s !default;
/* Fonts */ /* Fonts */
$mainFont: Helvetica, sans-serif !default;
$fontPath: '../fonts' !default; $fontPath: '../fonts' !default;
$fontName: 'main-fonts' !default; $fontName: 'main-fonts' !default;
$fontSize: 0.7rem;
$fontV: 20 !default;//random(1000) $fontV: 20 !default;//random(1000)

42
src/styles/scss/main.scss

@ -214,12 +214,13 @@ $prefix: $app-prefix;
} }
.#{$app-prefix}editor { .#{$app-prefix}editor {
font-family: $mainFont; font-family: $mainFont;
//background-color: $mainColor; font-size: $fontSize;
position:relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
height: 100%; height: 100%;
} }
.#{$app-prefix}freezed, .#{$app-prefix}freezed,
.#{$nv-prefix}freezed { .#{$nv-prefix}freezed {
@include opacity(0.50); @include opacity(0.50);
@ -459,36 +460,7 @@ $prefix: $app-prefix;
@import "gjs_inputs"; @import "gjs_inputs";
/********* Device Manager **********/ @import "gjs_devices";
.#{$app-prefix}devices-c {
display: flex;
align-items: center;
padding: 3px;
/*
padding: 10px 5px;
border-bottom: 1px solid rgba(0, 0, 0, 0.2);
margin-bottom: 10px;
*/
.#{$app-prefix}device-label {
flex-grow: 2;
font-size: 0.7em;
text-align: left;
margin-right: 10px;
}
.#{$app-prefix}select{
flex-grow: 20;
}
.#{$app-prefix}add-trasp{
flex-grow: 1;
margin-left: 5px;
}
}
/********* END Device Manager **********/
/********* General **********/ /********* General **********/

Loading…
Cancel
Save