Skip to content

Feature/tiny re-styling #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kadrian merged 8 commits into from
Mar 1, 2019
Merged

Feature/tiny re-styling #337

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fa9f100
Add cleaner logo, re-style header and green colors a little
Kadrian Feb 12, 2019
2e758d7
Merge branch 'develop' into feature/tiny-re-styling
Kadrian Feb 14, 2019
6875360
Merge branch 'develop' into feature/tiny-re-styling
manuel-hegner Feb 18, 2019
91c96bc
Merge branch 'develop' into feature/tiny-re-styling
Kadrian Feb 28, 2019
9dc0468
Update menu column active style
Kadrian Feb 28, 2019
bd58970
Merge branch 'feature/tiny-re-styling' of github.com:bakdata/conquery…
Kadrian Feb 28, 2019
eee7c37
Merge branch 'develop' into feature/tiny-re-styling
Kadrian Mar 1, 2019
bf32a7d
Merge branch 'develop' into feature/tiny-re-styling
Kadrian Mar 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added frontend/lib/images/conquery-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 0 additions & 23 deletions frontend/lib/images/conquery_logo.svg
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions frontend/lib/styles/components/categoryTreeNode.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
color: $col-red

&:hover
background-color: $col-blue-gray-light
background-color: $col-blue-gray-very-light

&--open
background-color: $col-blue-gray-light
background-color: $col-blue-gray-very-light
&:hover
background-color: rgba($col-blue-gray-light, 0.8)
background-color: rgba($col-blue-gray-very-light, 0.8)
9 changes: 5 additions & 4 deletions frontend/lib/styles/components/header.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.header
background-color: $col-blue-gray-dark
color: white
background-color: $col-gray-super-light
color: $col-blue-gray-dark
border-bottom: 1px solid $col-gray-medium-light
box-shadow: 0 0 3px 0 rgba(0,0,0,0.3)
padding: 0 20px
overflow: hidden
display: flex
Expand All @@ -21,8 +23,7 @@
&__headline
margin: 0 auto 0 0
line-height: 2
font-size: $font-sm
font-style: italic
font-size: $font-md
font-weight: 300

&__logo
Expand Down
6 changes: 3 additions & 3 deletions frontend/lib/styles/components/queryNodeEditor.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@
line-height: 21px

&__category_element_active
background: $col-blue-gray-light
background-color: $col-blue-gray-very-light

&:hover
background: $col-blue-gray-light
background-color: $col-blue-gray-very-light

&__category_action
line-height: 32px
Expand Down Expand Up @@ -178,4 +178,4 @@
.Select
&:not(.is-disabled)
.Select-control
border: 1px solid $col-blue-gray-dark !important // To override any is-focused styles
border: 1px solid $col-blue-gray-dark !important // To override any is-focused styles
4 changes: 2 additions & 2 deletions frontend/lib/styles/components/verticalToggleButton.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $vertical-toggle-button-border-radius: 2px

&--active
color: $col-black
background-color: $col-blue-gray-light
background-color: $col-blue-gray-very-light

&:hover
background-color: $col-blue-gray-light
background-color: $col-blue-gray-very-light
16 changes: 9 additions & 7 deletions frontend/lib/styles/conquery-colors.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
$col-bg: #f9f9f9

$col-black: #444
$col-black: #222
$col-gray: #999
$col-gray-medium-light: #aaa
$col-gray-light: #dadada
$col-gray-very-light: #eee
$col-gray-super-light: #fafafa

$col-red: #b22125

$col-blue-gray: #52A55C
$col-blue-gray-dark: #2C8437
$col-blue-gray-light: #84C68C
$col-blue-gray-dark: #0C6427
$col-blue-gray: #2C8437
$col-blue-gray-light: #52A55C
$col-blue-gray-very-light: #A4E6AC

$col-green: #36971C
$col-orange: #E9711C

$img-logo: '../images/conquery_logo.svg'
$img-logo-width: 167px
$img-logo-background-size: $img-logo-width 50px
$img-logo: '../images/conquery-logo.png'
$img-logo-width: 175px
$img-logo-background-size: $img-logo-width 45px

$img-spinner: '../images/spinner.png'