diff --git a/icon-font/font.sketch b/icon-font/font.sketch
index a00f09d..602bec5 100644
Binary files a/icon-font/font.sketch and b/icon-font/font.sketch differ
diff --git a/icon-font/svgs/icon-font_104_Edition.svg b/icon-font/svgs/icon-font_104_Edition.svg
new file mode 100644
index 0000000..524d76a
--- /dev/null
+++ b/icon-font/svgs/icon-font_104_Edition.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/icon-font/svgs/icon-font_105_View.svg b/icon-font/svgs/icon-font_105_View.svg
new file mode 100644
index 0000000..a7b9b7f
--- /dev/null
+++ b/icon-font/svgs/icon-font_105_View.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/icon-font/svgs/icon-font_106_Odyssey.svg b/icon-font/svgs/icon-font_106_Odyssey.svg
new file mode 100644
index 0000000..8564f89
--- /dev/null
+++ b/icon-font/svgs/icon-font_106_Odyssey.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/icon-font/svgs/icon-font_107_Settings.svg b/icon-font/svgs/icon-font_107_Settings.svg
new file mode 100644
index 0000000..aa42f1c
--- /dev/null
+++ b/icon-font/svgs/icon-font_107_Settings.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot
index be63c24..4f461cd 100644
Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ
diff --git a/src/fonts/cartoIcon.svg b/src/fonts/cartoIcon.svg
index c7bc81c..ddb32c5 100644
--- a/src/fonts/cartoIcon.svg
+++ b/src/fonts/cartoIcon.svg
@@ -46,269 +46,281 @@
-
+
+
+
+
diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf
index 34daf1e..c23969a 100644
Binary files a/src/fonts/cartoIcon.ttf and b/src/fonts/cartoIcon.ttf differ
diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff
index 571de25..e3e9849 100644
Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ
diff --git a/src/scss/cdb-components/menu.scss b/src/scss/cdb-components/menu.scss
index bd5df59..0d0c91c 100644
--- a/src/scss/cdb-components/menu.scss
+++ b/src/scss/cdb-components/menu.scss
@@ -2,7 +2,7 @@
// ----------------------------------------------
/* SG
-# Menu/
+# Menu/Navigation
```
@@ -71,6 +71,7 @@
*/
@import '../cdb-variables/colors';
+@import '../cdb-variables/sizes';
.CDB-NavMenu {
position: relative;
@@ -155,3 +156,102 @@
}
+/* SG
+# Menu/Editor
+
+
+```
+
+```
+*/
+
+.CDB-MenuEditor {
+ position: relative;
+ width: 72px;
+ min-height: 450px;
+ box-sizing: border-box;
+ padding: $baseSize * 2 0;
+ background: $cBlue;
+ box-shadow: 4px 0 $baseSize * 2 rgba(0, 0, 0, 0.05);
+}
+
+.CDB-MenuEditor-navigationItem {
+ padding: 12px $baseSize * 2 12px $baseSize + 6;
+ border-left: 2px solid transparent;
+ text-align: center;
+}
+.CDB-MenuEditor-navigationItem.is-selected {
+ border-left: 2px solid #FFF;
+}
+.CDB-MenuEditor-navigationItem.is-selected .CDB-MenuEditor-navigationIcon {
+ opacity: 1;
+}
+
+.CDB-MenuEditor-navigationLink {
+ display: block;
+}
+.CDB-MenuEditor-navigationIcon {
+ color: #FFF;
+ font-size: 24px;
+ line-height: 24px;
+ opacity: 0.32;
+}
+.CDB-MenuEditor-navigationLink:hover .CDB-MenuEditor-navigationIcon {
+ opacity: 1;
+}
+
+.CDB-MenuEditor-logo {
+ width: 40px;
+ height: 40px;
+ margin: 0 auto $baseSize * 2;
+ padding: $baseSize - 2 0;
+ border-radius: $baseSize / 2;
+ background: #FFF;
+ box-sizing: border-box;
+ font-size: $baseSize * 3;
+ text-align: center;
+}
+
+.CDB-MenuEditor-avatar {
+ position: absolute;
+ bottom: $baseSize * 2;
+ left: $baseSize * 2;
+ width: 40px;
+ height: 40px;
+}
+.CDB-MenuEditor-avatarImage {
+ width: 100%;
+ border-radius: $baseSize / 2;
+}
+
diff --git a/src/scss/cdb-icon-font.scss b/src/scss/cdb-icon-font.scss
index 9b56a11..7f12248 100644
--- a/src/scss/cdb-icon-font.scss
+++ b/src/scss/cdb-icon-font.scss
@@ -119,6 +119,30 @@ All available icons in CartoDB.
+
+
+
edition
+
+
+
+
+
+
view
+
+
+
+
+
+
odyssey
+
+
+
+
+
+
settings
+
+
+
wizard
@@ -716,441 +740,461 @@ All available icons in CartoDB.
}
-.CDB-IconFont-wizard::before {
+.CDB-IconFont-edition::before {
content: '\E00E';
}
-.CDB-IconFont-info::before {
+.CDB-IconFont-view::before {
content: '\E00F';
}
-.CDB-IconFont-fork::before {
+.CDB-IconFont-odyssey::before {
content: '\E010';
}
-.CDB-IconFont-facebook::before {
+.CDB-IconFont-settings::before {
content: '\E011';
}
-.CDB-IconFont-folder::before {
+.CDB-IconFont-wizard::before {
content: '\E012';
}
-.CDB-IconFont-dropbox::before {
+.CDB-IconFont-info::before {
content: '\E013';
}
-.CDB-IconFont-cloud::before {
+.CDB-IconFont-fork::before {
content: '\E014';
}
-.CDB-IconFont-step::before {
+.CDB-IconFont-facebook::before {
content: '\E015';
}
-.CDB-IconFont-addDocument::before {
+.CDB-IconFont-folder::before {
content: '\E016';
}
-.CDB-IconFont-arrowNext::before {
+.CDB-IconFont-dropbox::before {
content: '\E017';
}
-.CDB-IconFont-arrowPrev::before {
+.CDB-IconFont-cloud::before {
content: '\E018';
}
-.CDB-IconFont-close::before {
+.CDB-IconFont-step::before {
content: '\E019';
}
-.CDB-IconFont-cartoFante::before {
+.CDB-IconFont-addDocument::before {
content: '\E01A';
}
-.CDB-IconFont-lock::before {
+.CDB-IconFont-arrowNext::before {
content: '\E01B';
}
-.CDB-IconFont-cartoDB::before {
+.CDB-IconFont-arrowPrev::before {
content: '\E01C';
}
-.CDB-IconFont-lens::before {
+.CDB-IconFont-close::before {
content: '\E01D';
}
-.CDB-IconFont-closeLimits::before {
+.CDB-IconFont-cartoFante::before {
content: '\E01E';
}
-.CDB-IconFont-defaultUser::before {
+.CDB-IconFont-lock::before {
content: '\E01F';
}
-.CDB-IconFont-cockroach::before {
+.CDB-IconFont-cartoDB::before {
content: '\E020';
}
-.CDB-IconFont-floppy::before {
+.CDB-IconFont-lens::before {
content: '\E021';
}
-.CDB-IconFont-trash::before {
+.CDB-IconFont-closeLimits::before {
content: '\E022';
}
-.CDB-IconFont-wifi::before {
+.CDB-IconFont-defaultUser::before {
content: '\E023';
}
-.CDB-IconFont-unlock::before {
+.CDB-IconFont-cockroach::before {
content: '\E024';
}
-.CDB-IconFont-unlockWithEllipsis::before {
+.CDB-IconFont-floppy::before {
content: '\E025';
}
-.CDB-IconFont-gift::before {
+.CDB-IconFont-trash::before {
content: '\E026';
}
-.CDB-IconFont-people::before {
+.CDB-IconFont-wifi::before {
content: '\E027';
}
-.CDB-IconFont-play::before {
+.CDB-IconFont-unlock::before {
content: '\E028';
}
-.CDB-IconFont-add::before {
+.CDB-IconFont-unlockWithEllipsis::before {
content: '\E029';
}
-.CDB-IconFont-map::before {
+.CDB-IconFont-gift::before {
content: '\E02A';
}
-.CDB-IconFont-anchor::before {
+.CDB-IconFont-people::before {
content: '\E02B';
}
-.CDB-IconFont-key::before {
+.CDB-IconFont-play::before {
content: '\E02C';
}
-.CDB-IconFont-calendar::before {
+.CDB-IconFont-add::before {
content: '\E02D';
}
-.CDB-IconFont-document::before {
+.CDB-IconFont-map::before {
content: '\E02E';
}
-.CDB-IconFont-eye::before {
+.CDB-IconFont-anchor::before {
content: '\E02F';
}
-.CDB-IconFont-marker::before {
+.CDB-IconFont-key::before {
content: '\E030';
}
-.CDB-IconFont-progressBar::before {
+.CDB-IconFont-calendar::before {
content: '\E031';
}
-.CDB-IconFont-book::before {
+.CDB-IconFont-document::before {
content: '\E032';
}
-.CDB-IconFont-notes::before {
+.CDB-IconFont-eye::before {
content: '\E033';
}
-.CDB-IconFont-rectangles::before {
+.CDB-IconFont-marker::before {
content: '\E034';
}
-.CDB-IconFont-mountain::before {
+.CDB-IconFont-progressBar::before {
content: '\E035';
}
-.CDB-IconFont-points::before {
+.CDB-IconFont-book::before {
content: '\E036';
}
-.CDB-IconFont-snake::before {
+.CDB-IconFont-notes::before {
content: '\E037';
}
-.CDB-IconFont-boss::before {
+.CDB-IconFont-rectangles::before {
content: '\E038';
}
-.CDB-IconFont-rocket::before {
+.CDB-IconFont-mountain::before {
content: '\E039';
}
-.CDB-IconFont-barometer::before {
+.CDB-IconFont-points::before {
content: '\E03A';
}
-.CDB-IconFont-dollar::before {
+.CDB-IconFont-snake::before {
content: '\E03B';
}
-.CDB-IconFont-email::before {
+.CDB-IconFont-boss::before {
content: '\E03C';
}
-.CDB-IconFont-label::before {
+.CDB-IconFont-rocket::before {
content: '\E03D';
}
-.CDB-IconFont-outside::before {
+.CDB-IconFont-barometer::before {
content: '\E03E';
}
-.CDB-IconFont-jigsaw::before {
+.CDB-IconFont-dollar::before {
content: '\E03F';
}
-.CDB-IconFont-tools::before {
+.CDB-IconFont-email::before {
content: '\E040';
}
-.CDB-IconFont-question::before {
+.CDB-IconFont-label::before {
content: '\E041';
}
-.CDB-IconFont-layerStack::before {
+.CDB-IconFont-outside::before {
content: '\E042';
}
-.CDB-IconFont-alarm::before {
+.CDB-IconFont-jigsaw::before {
content: '\E043';
}
-.CDB-IconFont-cloudDownArrow::before {
+.CDB-IconFont-tools::before {
content: '\E044';
}
-.CDB-IconFont-pencil::before {
+.CDB-IconFont-question::before {
content: '\E045';
}
-.CDB-IconFont-fountainPen::before {
+.CDB-IconFont-layerStack::before {
content: '\E046';
}
-.CDB-IconFont-emptyDoc::before {
+.CDB-IconFont-alarm::before {
content: '\E047';
}
-.CDB-IconFont-mergeArrow::before {
+.CDB-IconFont-cloudDownArrow::before {
content: '\E048';
}
-.CDB-IconFont-mergeColumns::before {
+.CDB-IconFont-pencil::before {
content: '\E049';
}
-.CDB-IconFont-mergeSpatial::before {
+.CDB-IconFont-fountainPen::before {
content: '\E04A';
}
-.CDB-IconFont-globe::before {
+.CDB-IconFont-emptyDoc::before {
content: '\E04B';
}
-.CDB-IconFont-chevronDown::before {
+.CDB-IconFont-mergeArrow::before {
content: '\E04C';
}
-.CDB-IconFont-streets::before {
+.CDB-IconFont-mergeColumns::before {
content: '\E04D';
}
-.CDB-IconFont-keys::before {
+.CDB-IconFont-mergeSpatial::before {
content: '\E04E';
}
-.CDB-IconFont-facebookSquare::before {
+.CDB-IconFont-globe::before {
content: '\E04F';
}
-.CDB-IconFont-fullscreen::before {
+.CDB-IconFont-chevronDown::before {
content: '\E050';
}
-.CDB-IconFont-rArrowLight::before {
+.CDB-IconFont-streets::before {
content: '\E051';
}
-.CDB-IconFont-share::before {
+.CDB-IconFont-keys::before {
content: '\E052';
}
-.CDB-IconFont-linkedin::before {
+.CDB-IconFont-facebookSquare::before {
content: '\E053';
}
-.CDB-IconFont-calendarBlank::before {
+.CDB-IconFont-fullscreen::before {
content: '\E054';
}
-.CDB-IconFont-creativeCommons::before {
+.CDB-IconFont-rArrowLight::before {
content: '\E055';
}
-.CDB-IconFont-bubble::before {
+.CDB-IconFont-share::before {
content: '\E056';
}
-.CDB-IconFont-bars::before {
+.CDB-IconFont-linkedin::before {
content: '\E057';
}
-.CDB-IconFont-arrowMenuLight::before {
+.CDB-IconFont-calendarBlank::before {
content: '\E058';
}
-.CDB-IconFont-tieFighter::before {
+.CDB-IconFont-creativeCommons::before {
content: '\E059';
}
-.CDB-IconFont-ray::before {
+.CDB-IconFont-bubble::before {
content: '\E05A';
}
-.CDB-IconFont-markup::before {
+.CDB-IconFont-bars::before {
content: '\E05B';
}
-.CDB-IconFont-table::before {
+.CDB-IconFont-arrowMenuLight::before {
content: '\E05C';
}
-.CDB-IconFont-airlock::before {
+.CDB-IconFont-tieFighter::before {
content: '\E05D';
}
-.CDB-IconFont-pin::before {
+.CDB-IconFont-ray::before {
content: '\E05E';
}
-.CDB-IconFont-attache::before {
+.CDB-IconFont-markup::before {
content: '\E05F';
}
-.CDB-IconFont-download::before {
+.CDB-IconFont-table::before {
content: '\E060';
}
-.CDB-IconFont-group::before {
+.CDB-IconFont-airlock::before {
content: '\E061';
}
-.CDB-IconFont-dashboard::before {
+.CDB-IconFont-pin::before {
content: '\E062';
}
-.CDB-IconFont-spinner::before {
+.CDB-IconFont-attache::before {
content: '\E063';
}
-.CDB-IconFont-mapsearch::before {
+.CDB-IconFont-download::before {
content: '\E064';
}
-.CDB-IconFont-rArrow::before {
+.CDB-IconFont-group::before {
content: '\E065';
}
+
+
+.CDB-IconFont-dashboard::before {
+ content: '\E066';
+}
+
+
+.CDB-IconFont-spinner::before {
+ content: '\E067';
+}
+
+
+.CDB-IconFont-mapsearch::before {
+ content: '\E068';
+}
+
+
+.CDB-IconFont-rArrow::before {
+ content: '\E069';
+}
+
+