Skip to content

App menu compatibiliy #336

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
juliusknorr merged 14 commits into from
Nov 27, 2017
Merged

App menu compatibiliy #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
29c6b3d
Frontend: Update app menu to fit new NC13 flex layout
juliusknorr Oct 3, 2017
8dd3b4a
Navigation: make editing work again
juliusknorr Oct 25, 2017
f2b4f05
Refactor boardlist loading process
juliusknorr Oct 26, 2017
7f1ea3b
Performance optimizations in list template
juliusknorr Oct 26, 2017
812eedb
Fix board updating reset
juliusknorr Oct 26, 2017
38febfa
Fix menu
juliusknorr Nov 8, 2017
2cbeea0
Move variables to legacy scss
juliusknorr Nov 8, 2017
dcc1214
Add fix for nc<13 app menu
juliusknorr Nov 8, 2017
e14af53
CSS: Move icons to separate file
juliusknorr Nov 8, 2017
4e1fbcb
CSS: restore variables that are not part of the server
juliusknorr Nov 8, 2017
a7a960b
Fix popovermenus on 13
juliusknorr Nov 8, 2017
9573e66
Fix popover hiding
juliusknorr Nov 8, 2017
3e68e2d
Fix overlooked rebasing error
juliusknorr Nov 17, 2017
4037a03
Remove legacy css build and move scss imports to the top
juliusknorr Nov 26, 2017
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
5 changes: 1 addition & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,11 @@ install-deps:
cd js && npm install --deps
cd js && ./node_modules/.bin/bower install

build: build-js build-css
build: build-js

build-js: install-deps
cd js && ./node_modules/.bin/grunt build

build-css: install-deps
./js/node_modules/node-sass/bin/node-sass --output-style compressed css/legacy.scss css/style.css

watch:
cd js && ./node_modules/.bin/grunt watch

Expand Down
27 changes: 24 additions & 3 deletions css/legacy.scss → css/comp-appnav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
* @copyright Copyright (c) 2017 Julius Härtl <jus@bitgrid.net>
*
* @author Julius Härtl <jus@bitgrid.net>
*
Expand All @@ -20,5 +20,26 @@
*
*/

@import '../../../core/css/variables.scss';
@import 'style.scss';
/**
* Hotfix for support <NC13 with new app sidebar
*/
#app-navigation {
.app-navigation-entry-menu.open {
ul li a {
background-position: 10px center;
padding: 0 10px 0 36px !important;
}
}
.app-navigation-entry-edit {
display: none;
}
.editing {
.app-navigation-entry-edit {
display: block;
position: absolute;
background: $color-main-background;
height: auto;
z-index: 250;
}
}
}
42 changes: 42 additions & 0 deletions css/icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/**
* Custom icons
*/
.icon-deck {
background-image: url('../img/deck-dark.svg');
}

.icon-group {
background-image: url('../../../settings/img/users.svg');
}

.icon-help {
background-image: url('../../../settings/img/help.svg');
}

.icon-add-white {
background-image: url('../img/add-white.svg');
}

.icon-archive {
background-image: url('../img/archive.svg');
}

.icon-archive-white {
background-image: url('../img/archive-white.svg');
}

.icon-details {
background-image: url('../img/details.svg');
}

.icon-details-white {
background-image: url('../img/details-white.svg');
}

.icon-home {
background-image: url('../../../core/img/places/home.svg');
}

.icon-badge {
background-image: url('../../../core/img/places/calendar-dark.svg');
}
106 changes: 24 additions & 82 deletions css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,14 @@
*
*/

/**
* Variables
*/
$color-main-background: #fff;
$color-primary-text: #fff;
$color-error: #e9322d;
$color-warning: #fbd850;
$color-warning-light: nc-lighten($color-warning, 15%);
$color-success: #46ba61;
$color-lightgrey: nc-darken($color-main-background, 4%);
$color-grey: nc-darken($color-main-background, 7%);
$color-darkgrey: nc-darken($color-main-background, 32%);

@import 'comp-appnav.scss';
@import 'icons.scss';

/**
* General styles
*/
Expand Down Expand Up @@ -75,24 +70,9 @@ input.input-inline {
/**
* Navigation sidebar
*/
.app-navigation-entry-menu {
ul {
flex-direction: row;
}
}

#app-navigation {
.app-navigation-entry-edit {
height: auto;

.colorselect div{
height: 32px;
}
form {
display: flex;
}
}

/** menu */
.board-bullet {
position: absolute;
margin-left: 17px;
Expand All @@ -103,21 +83,30 @@ input.input-inline {
border-radius: 50%;
cursor: pointer;
}
.app-navigation-entry-utils-menu-share i {
height: 100%;
width: 100%;
}

.app-navigation-entry-utils {
.app-navigation-entry-utils-menu-button {
display: block !important; // TODO: is this needed?
}
li {
transition: height 250ms ease-in-out, opacity 250ms ease-in-out, z-index 250ms ease-in-out;
}
.editing {
height: 82px;

.app-navigation-entry-utils-menu-share {
display: flex !important;
padding: 14px;
opacity: 0.5;
.icon-add {
background-position: 14px 14px;
}
}
.app-navigation-entry-menu ul {
flex-direction: row;
.app-navigation-entry-edit {
.colorselect div{
height: 32px;
}
form {
display: flex;
}
}

}

/**
Expand Down Expand Up @@ -510,8 +499,6 @@ input.input-inline {
z-index: 999;
opacity: 1;
display: block;
margin-top: 25px;
margin-right: 0px;

&.hidden {
display: none;
Expand Down Expand Up @@ -848,6 +835,7 @@ input.input-inline {

button {
opacity: 0.5;
padding: 22px;
}

&:hover button {
Expand All @@ -866,10 +854,6 @@ input.input-inline {
opacity: 0.5;
}

.popovermenu {
margin-top: 5px;
}

.board-edit-controls {
display: flex;
}
Expand Down Expand Up @@ -1166,48 +1150,6 @@ input.input-inline {
}
}

/**
* Custom icons
*/
.icon-deck {
background-image: url('../img/deck-dark.svg');
}

.icon-group {
background-image: url('../../../settings/img/users.svg');
}

.icon-help {
background-image: url('../../../settings/img/help.svg');
}

.icon-add-white {
background-image: url('../img/add-white.svg');
}

.icon-archive {
background-image: url('../img/archive.svg');
}

.icon-archive-white {
background-image: url('../img/archive-white.svg');
}

.icon-details {
background-image: url('../img/details.svg');
}

.icon-details-white {
background-image: url('../img/details-white.svg');
}

.icon-home {
background-image: url('../../../core/img/places/home.svg');
}

.icon-badge {
background-image: url('../../../core/img/places/calendar-dark.svg');
}

/**
* Hotfix for https://github.com/angular-ui/ui-select/issues/1652
Expand Down
Loading