Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
57cd03da by Joeri de Gooijer at 2016-06-08T16:37:48+02:00
CHANNELMGR-737 Use Open Sans font in Channel Manager
- - - - -
352c8368 by Joeri de Gooijer at 2016-06-13T10:27:39+02:00
CHANNELMGR-737 fix opensans font cutoff in list-items
- - - - -
066fd297 by Mathijs den Burger at 2016-06-14T10:22:15+02:00
CHANNELMGR-737 Reintegrate bugfix/CHANNELMGR-737
- - - - -
5 changed files:
- frontend-ng/bower.json
- frontend-ng/build.conf.js
- frontend-ng/src/index.scss
- frontend-ng/src/styles/_sidenav.scss
- frontend-ng/src/styles/_variables.scss
Changes:
=====================================
frontend-ng/bower.json
=====================================
--- a/frontend-ng/bower.json
+++ b/frontend-ng/bower.json
@@ -16,7 +16,8 @@
"jquery": "2.2.0",
"velocity": "1.2.3",
"ng-device-detector": "3.0.1",
- "ng-focus-if": "1.0.5"
+ "ng-focus-if": "1.0.5",
+ "open-sans-fontface": "1.4.2"
},
"devDependencies": {
"angular-mocks": "1.4.8"
=====================================
frontend-ng/build.conf.js
=====================================
--- a/frontend-ng/build.conf.js
+++ b/frontend-ng/build.conf.js
@@ -33,6 +33,10 @@ const customConfig = {
src: 'src/styles/hippo-iframe.css',
dest: `${targetDir}styles`,
},
+ {
+ src: 'bower_components/open-sans-fontface/fonts/Regular/*',
+ dest: `${targetDir}fonts/Regular`,
+ },
],
systemjsOptions: {
transpiler: 'babel',
=====================================
frontend-ng/src/index.scss
=====================================
--- a/frontend-ng/src/index.scss
+++ b/frontend-ng/src/index.scss
@@ -14,6 +14,12 @@
@import 'styles/variables';
+// Open Sans font
+@import '../bower_components/open-sans-fontface/sass/variables';
+@import '../bower_components/open-sans-fontface/sass/mixins';
+@import '../bower_components/open-sans-fontface/sass/Regular';
+
+// Angular Material framework
@import '../bower_components/angular-material/angular-material.scss';
@import 'styles/button-toggle';
=====================================
frontend-ng/src/styles/_sidenav.scss
=====================================
--- a/frontend-ng/src/styles/_sidenav.scss
+++ b/frontend-ng/src/styles/_sidenav.scss
@@ -25,6 +25,11 @@
background-color: $list-item-active-bgcolor;
}
+// OpenSans fonts cut off at the 'g' with line-height 1.2 from Material
+.md-list-item-text h4 {
+ line-height: 1.3em !important;
+}
+
.catalog-dd-container-item {
cursor: move; // IE 11&edge
cursor: grab;
=====================================
frontend-ng/src/styles/_variables.scss
=====================================
--- a/frontend-ng/src/styles/_variables.scss
+++ b/frontend-ng/src/styles/_variables.scss
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Blue palette
+// Color palettes
$blue-50: #cfe7fc;
$blue-100: #94c9f7;
$blue-200: #5faff5;
@@ -27,7 +27,7 @@ $blue-a100: #99cfff;
$blue-a200: #4da0ff;
$blue-a400: #267dff;
$blue-a700: #0357ff;
-// Orange palette
+
$orange-50: #fce1cf;
$orange-100: #f7ba94;
$orange-200: #f59356;
@@ -42,7 +42,7 @@ $orange-a100: #ffc099;
$orange-a200: #ff9659;
$orange-a400: #ff751a;
$orange-a700: #ff5203;
-// Red palette
+
$red-50: #fccfcf;
$red-100: #fc8c8c;
$red-200: #fa5151;
@@ -57,7 +57,7 @@ $red-a100: #f99;
$red-a200: #ff596a;
$red-a400: #ff334e;
$red-a700: #f70029;
-// Grey palette
+
$grey-50: #fff;
$grey-100: #f4f4f5;
$grey-200: #e8e8ea;
@@ -72,10 +72,15 @@ $grey-a100: #fff;
$grey-a200: #000;
$grey-a400: #303030;
$grey-a700: #39434c;
-// Contrast colors
+
+// Text colors
$text-dark: rgba(0, 0, 0, .87);
$text-light: rgba(255, 255, 255, .87);
+// Typography
+$font-family: 'Open Sans', Roboto, 'Helvetica Neue', sans-serif;
+$OpenSansPath: '../fonts';
+
//TODO Clean these variables, replace with color palette
$white: #fff;
$black: #000;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/807d702399cbd24af4a4c31a9507ccfb56799ad9...066fd297baf23951ae04dfdd01eb7f9767c835a4
_______________________________________________
Hippocms-svn mailing list
[email protected]
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
