From 62b9ad43abd592c6617225f4f817b88c37c984a1 Mon Sep 17 00:00:00 2001 From: Alexandre Jarnoux Date: Mon, 22 Aug 2016 16:24:05 +1000 Subject: [PATCH 1/8] [MNOE-95] Revert the cache clearing --- src/app/components/mnoe-api/app-instances.svc.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/components/mnoe-api/app-instances.svc.coffee b/src/app/components/mnoe-api/app-instances.svc.coffee index b33396ef0..adbb3a984 100644 --- a/src/app/components/mnoe-api/app-instances.svc.coffee +++ b/src/app/components/mnoe-api/app-instances.svc.coffee @@ -13,7 +13,6 @@ angular.module 'mnoEnterpriseAngular' cache = MnoLocalStorage.getObject(MnoeCurrentUser.user.id + "_" + LOCALSTORAGE.appInstancesKey) if cache? # Process the cache - @clearCache processAppInstances(cache) # Return the promised cache return $q.resolve(cache) From 4d635489a9951cd0612454e36cc235d3cd3bdf09 Mon Sep 17 00:00:00 2001 From: Alexandre Jarnoux Date: Mon, 22 Aug 2016 16:37:23 +1000 Subject: [PATCH 2/8] Replace btn-grey by btn-warning --- src/app/stylesheets/custom/button.less | 16 ---------------- src/app/views/company/team-list/team-list.html | 6 +++--- .../views/company/teams/organization-teams.html | 11 +++++------ 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/app/stylesheets/custom/button.less b/src/app/stylesheets/custom/button.less index e58749599..e093dafae 100644 --- a/src/app/stylesheets/custom/button.less +++ b/src/app/stylesheets/custom/button.less @@ -54,22 +54,6 @@ } } - &.btn-grey { - background-color: @decorator-inverse-color; - border: solid 1px @bg-main-color; - color: lighten(@bg-inverse-color,5%); - font-weight: 400; - - &:hover { - color: @bg-inverse-color; - background-color: darken(@bg-main-color,5%); - } - - &.btn-grey-bordered { - border: solid 1px darken(@bg-main-color,5%); - } - } - &.btn-whited { background-color: lighten(#ccc,15%); border: solid 1px #ccc; diff --git a/src/app/views/company/team-list/team-list.html b/src/app/views/company/team-list/team-list.html index 15209d548..7701a4b98 100644 --- a/src/app/views/company/team-list/team-list.html +++ b/src/app/views/company/team-list/team-list.html @@ -16,12 +16,12 @@

{{ title }}

-

+

{{ 'mno_enterprise.templates.dashboard.teams.team_list.add_team_members' | translate:{teamname: team.name} }}

- @@ -30,7 +30,7 @@

{{ title }}

- diff --git a/src/app/views/company/teams/organization-teams.html b/src/app/views/company/teams/organization-teams.html index 8467c2320..ab6201ec5 100644 --- a/src/app/views/company/teams/organization-teams.html +++ b/src/app/views/company/teams/organization-teams.html @@ -31,7 +31,6 @@
- @@ -52,7 +51,7 @@ -
- @@ -86,7 +85,7 @@
- +
@@ -100,8 +99,8 @@
-

{{ 'mno_enterprise.templates.dashboard.teams.index.no_apps_warning' | translate }}

- +

{{ 'mno_enterprise.templates.dashboard.teams.index.no_apps_warning' | translate }}

+   {{ 'mno_enterprise.templates.dashboard.teams.index.add_app' | translate }} From 23b6a77296a969c2d32f679cf309a3ceed6df98f Mon Sep 17 00:00:00 2001 From: Alexandre Jarnoux Date: Mon, 22 Aug 2016 16:43:05 +1000 Subject: [PATCH 3/8] Fix the panels colors --- src/app/stylesheets/custom/accordion.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/stylesheets/custom/accordion.less b/src/app/stylesheets/custom/accordion.less index 31623539b..3ab8bf37b 100644 --- a/src/app/stylesheets/custom/accordion.less +++ b/src/app/stylesheets/custom/accordion.less @@ -6,7 +6,8 @@ .panel-group > .panel, .panel-group > .panel > .panel-heading { - background-color: white; + color: @text-strong-color; + background-color: @bg-inverse-color; border: none; box-shadow: none; } From a5dd0bb4cea744d48de2ed9aa5196ceb88792083 Mon Sep 17 00:00:00 2001 From: Alexandre Jarnoux Date: Mon, 22 Aug 2016 16:44:11 +1000 Subject: [PATCH 4/8] Remove unused code --- src/app/stylesheets/custom/form.less | 33 ------------------- src/app/stylesheets/custom/utilities.less | 4 --- src/app/views/company/company.html | 2 +- .../views/company/team-list/team-list.html | 3 +- .../company/teams/organization-teams.html | 5 ++- 5 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 src/app/stylesheets/custom/utilities.less diff --git a/src/app/stylesheets/custom/form.less b/src/app/stylesheets/custom/form.less index adebb7ef0..6b3fb35ad 100644 --- a/src/app/stylesheets/custom/form.less +++ b/src/app/stylesheets/custom/form.less @@ -25,22 +25,6 @@ form label { background-color: @input-bg; } - -select { - text-indent: 1px; - text-overflow: ''; -} - -// Remove dropdown arrow (Chrome, Firefox and IE) -select.unstyled { - -webkit-appearance: none; - -moz-appearance: none; -} - -select::-ms-expand { - display: none; -} - //---------------------------------------- // Styling for phone: select + input //---------------------------------------- @@ -106,7 +90,6 @@ form.inverse { //------------------------------------ // Dark forms styles //------------------------------------ - form.dark { input[type='text'], input[type='email'], textarea { border-radius: 5px; @@ -120,22 +103,6 @@ form.dark { padding: 5px 5px 5px 15px; } - *::-webkit-input-placeholder { - color: @bg-main-color; - } - *:-moz-placeholder { - /* FF 4-18 */ - color: @bg-main-color; - } - *::-moz-placeholder { - /* FF 19+ */ - color: @bg-main-color; - } - *:-ms-input-placeholder { - /* IE 10+ */ - color: @bg-main-color; - } - label { color: @bg-main-color; } diff --git a/src/app/stylesheets/custom/utilities.less b/src/app/stylesheets/custom/utilities.less deleted file mode 100644 index d4cefe700..000000000 --- a/src/app/stylesheets/custom/utilities.less +++ /dev/null @@ -1,4 +0,0 @@ - -.text-bg-inverse { - color: @text-color; -} diff --git a/src/app/views/company/company.html b/src/app/views/company/company.html index c12850217..1c7039faf 100644 --- a/src/app/views/company/company.html +++ b/src/app/views/company/company.html @@ -111,7 +111,7 @@

{{ 'mno_enterprise.templates.dashboard.organization.in
{{ 'mno_enterprise.templates.dashboard.organization.index.teams.title' | translate }}
-

+

{{ 'mno_enterprise.templates.dashboard.organization.index.teams.subtitle' | translate }}  {{ 'mno_enterprise.templates.dashboard.organization.index.teams.control_access' | translate }}

diff --git a/src/app/views/company/team-list/team-list.html b/src/app/views/company/team-list/team-list.html index 7701a4b98..d49a457cc 100644 --- a/src/app/views/company/team-list/team-list.html +++ b/src/app/views/company/team-list/team-list.html @@ -53,7 +53,8 @@

{{ title }}

- {{ 'mno_enterprise.templates.dashboard.teams.team_list.tbl_name' | translate }}: + {{ 'mno_enterprise.templates.dashboard.teams.team_list.tbl_name' | translate }}: + {{ member.name }}
diff --git a/src/app/views/company/teams/organization-teams.html b/src/app/views/company/teams/organization-teams.html index ab6201ec5..d013e170a 100644 --- a/src/app/views/company/teams/organization-teams.html +++ b/src/app/views/company/teams/organization-teams.html @@ -52,12 +52,11 @@ - {{ 'mno_enterprise.templates.dashboard.teams.index.all' | translate }} @@ -101,7 +100,7 @@

{{ 'mno_enterprise.templates.dashboard.teams.index.no_apps_warning' | translate }}

 - +   {{ 'mno_enterprise.templates.dashboard.teams.index.add_app' | translate }} From c8163e6a0cf189ef81b2c88a8dfd59665202f227 Mon Sep 17 00:00:00 2001 From: Alexandre Jarnoux Date: Mon, 22 Aug 2016 16:45:08 +1000 Subject: [PATCH 5/8] [MNOE-104] Teams rendering when empty --- .../company/teams/organization-teams.html | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/app/views/company/teams/organization-teams.html b/src/app/views/company/teams/organization-teams.html index d013e170a..b402b76c8 100644 --- a/src/app/views/company/teams/organization-teams.html +++ b/src/app/views/company/teams/organization-teams.html @@ -4,17 +4,16 @@
-
-
-

- {{ 'mno_enterprise.templates.dashboard.teams.index.no_teams_warning' | translate }} -

- - +
+
+
+

{{ 'mno_enterprise.templates.dashboard.teams.index.no_teams_warning' | translate }}

+ + +
From 193cf7b23c5315c04c78cfffaaa4e04ed54f4ee2 Mon Sep 17 00:00:00 2001 From: Alexandre Jarnoux Date: Mon, 22 Aug 2016 17:37:43 +1000 Subject: [PATCH 6/8] Fix desktop layout --- src/app/views/layout.html | 10 +++------- src/app/views/layout.less | 4 ++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/views/layout.html b/src/app/views/layout.html index c8aa12b73..c87ff217d 100644 --- a/src/app/views/layout.html +++ b/src/app/views/layout.html @@ -9,12 +9,8 @@
-
- - -
-
-
-
+ + +
diff --git a/src/app/views/layout.less b/src/app/views/layout.less index 30e1c23f7..1409c14c6 100644 --- a/src/app/views/layout.less +++ b/src/app/views/layout.less @@ -21,7 +21,11 @@ } #dashboard { + // Space for the retracted menu + margin-left: 80px; + @media (max-width: @screen-xs-max) { padding-top: 40px; + margin-left: 0; } } From 08b6947732886bdc15d3b32f0c1aed45cb7fe268 Mon Sep 17 00:00:00 2001 From: Alexandre Jarnoux Date: Mon, 22 Aug 2016 17:54:40 +1000 Subject: [PATCH 7/8] Fix the container width breakpoints --- src/app/views/layout.less | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/app/views/layout.less b/src/app/views/layout.less index 1409c14c6..f0df41599 100644 --- a/src/app/views/layout.less +++ b/src/app/views/layout.less @@ -1,3 +1,5 @@ +@menu-left-width: 80px; + #layout-loading { position: absolute; top: 0px; @@ -21,8 +23,28 @@ } #dashboard { - // Space for the retracted menu - margin-left: 80px; + margin-left: @menu-left-width; + + /* Fix the container width if the screen is sm+ */ + @media screen and (min-width: @screen-sm-min) { + .container { + width: @container-sm - @menu-left-width; + } + } + + /* Fix the container width if the screen is md+ */ + @media screen and (min-width: @screen-md-min) { + .container { + width: @container-md - @menu-left-width; + } + } + + /* Fix the container width if the screen is lg+ */ + @media screen and (min-width: @screen-lg-min) { + .container { + width: @container-lg - @menu-left-width; + } + } @media (max-width: @screen-xs-max) { padding-top: 40px; From 80fc198f188efef7d4f1d731ec11ed3ebd77a1ad Mon Sep 17 00:00:00 2001 From: Alexandre Jarnoux Date: Tue, 23 Aug 2016 09:14:46 +1000 Subject: [PATCH 8/8] Remove remaining spacer*, use top-buffer-* --- src/app/views/company/team-list/modals/member-add-modal.html | 1 - src/app/views/company/teams/modals/team-add-modal.html | 1 - 2 files changed, 2 deletions(-) diff --git a/src/app/views/company/team-list/modals/member-add-modal.html b/src/app/views/company/team-list/modals/member-add-modal.html index bed296e3c..b52ec1ce7 100644 --- a/src/app/views/company/team-list/modals/member-add-modal.html +++ b/src/app/views/company/team-list/modals/member-add-modal.html @@ -24,7 +24,6 @@

{{ 'mno_enterprise.templates.dashboard.teams.member_add_modal.title' | trans

{{ 'mno_enterprise.templates.dashboard.teams.member_add_modal.select_company_members' | translate }}

-
diff --git a/src/app/views/company/teams/modals/team-add-modal.html b/src/app/views/company/teams/modals/team-add-modal.html index ae38d1d95..8f4f71038 100644 --- a/src/app/views/company/teams/modals/team-add-modal.html +++ b/src/app/views/company/teams/modals/team-add-modal.html @@ -18,7 +18,6 @@

{{ 'mno_enterprise.templates.dashboard.teams.team_add_modal.title' | transla

{{ 'mno_enterprise.templates.dashboard.teams.team_add_modal.enter_team_name' | translate }}

-