ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2025-12-26 16:10:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/add-range-slider

Browse Source
This commit is contained in:
orangemug
2020-01-19 11:06:39 +00:00
parent 2ccd1d227e 6c240d53e4
commit 59e070f463
23 changed files with 340 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/styles/_modal.scss
View File

@@ -280,3 +280,7 @@
color: $color-green;
margin-top: 16px;
}
.modal-settings {
width: 400px;
}

4
src/styles/_react-collapse.scss
View File

@@ -7,3 +7,7 @@
flex: 1;
}
}
.ReactCollapse--collapse {
transition: height 180ms;
}

23
src/styles/_vars.scss Normal file
View File

@@ -0,0 +1,23 @@
$color-black: #191b20;
$color-gray: #222429;
$color-midgray: #303237;
$color-lowgray: #a4a4a4;
$color-white: #f0f0f0;
$color-red: #cf4a4a;
$color-green: #53b972;
$margin-1: 3px;
$margin-2: 5px;
$margin-3: 10px;
$margin-4: 30px;
$margin-5: 40px;
$font-size-1: 24px;
$font-size-2: 20px;
$font-size-3: 18px;
$font-size-4: 16px;
$font-size-5: 14px;
$font-size-6: 12px;
$font-family: Roboto, sans-serif;
$toolbar-height: 40px;
$toolbar-offset: 0;

24
src/styles/index.scss
View File

@@ -1,26 +1,4 @@
$color-black: #191b20;
$color-gray: #222429;
$color-midgray: #303237;
$color-lowgray: #a4a4a4;
$color-white: #f0f0f0;
$color-red: #cf4a4a;
$color-green: #53b972;
$margin-1: 3px;
$margin-2: 5px;
$margin-3: 10px;
$margin-4: 30px;
$margin-5: 40px;
$font-size-1: 24px;
$font-size-2: 20px;
$font-size-3: 18px;
$font-size-4: 16px;
$font-size-5: 14px;
$font-size-6: 12px;
$font-family: Roboto, sans-serif;
$toolbar-height: 40px;
$toolbar-offset: 0;
@import 'vars';
@import 'mixins';
@import 'reset';
@import 'base';