Padding Between bookmarks should be narrower

brave · May 23, 2016 · db90011 · db90011
1 parent aa50938
commit db90011
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -129,7 +129,7 @@ class GeneralTab extends ImmutableComponent {
       <SettingsList dataL10nId='bookmarkToolbarSettings'>
         <SettingCheckbox dataL10nId='bookmarkToolbar' prefKey={settings.SHOW_BOOKMARKS_TOOLBAR} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         <SettingCheckbox dataL10nId='bookmarkToolbarShowFavicon' prefKey={settings.SHOW_BOOKMARKS_TOOLBAR_FAVICON} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
-        <SettingCheckbox dataL10nId='bookmarkToolbarShowOnlyFavicon' style={{ visibility: (getSetting(settings.SHOW_BOOKMARKS_TOOLBAR_FAVICON, this.props.settings) === true ? 'visible' : 'hidden') }} prefKey={settings.SHOW_BOOKMARKS_TOOLBAR_ONLY_FAVICON} settings={getSetting(settings.SHOW_BOOKMARKS_TOOLBAR_FAVICON, this.props.settings) === true ? this.props.settings : false} onChangeSetting={this.props.onChangeSetting} />
+        <SettingCheckbox dataL10nId='bookmarkToolbarShowOnlyFavicon' style={{ visibility: (getSetting(settings.SHOW_BOOKMARKS_TOOLBAR_FAVICON, this.props.settings) === true ? 'visible' : 'hidden') }} prefKey={settings.SHOW_BOOKMARKS_TOOLBAR_ONLY_FAVICON} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
       </SettingsList>
       <SettingsList dataL10nId='appearanceSettings'>
         <SettingCheckbox dataL10nId='showHomeButton' prefKey={settings.SHOW_HOME_BUTTON} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />

diff --git a/js/components/bookmarksToolbar.js b/js/components/bookmarksToolbar.js
@@ -149,7 +149,8 @@ class BookmarkToolbarButton extends ImmutableComponent {
         bookmarkToolbarButton: true,
         draggingOverLeft: this.isDraggingOverLeft && !this.isExpanded,
         draggingOverRight: this.isDraggingOverRight && !this.isExpanded,
-        isDragging: this.isDragging
+        isDragging: this.isDragging,
+        showOnlyFavicon: showFavicon && showOnlyFavicon
       })}
       draggable
       ref={(node) => { this.bookmarkNode = node }}

diff --git a/less/bookmarksToolbar.less b/less/bookmarksToolbar.less
@@ -52,6 +52,10 @@
     -webkit-user-select: none;
     align-items: center;
     display: flex;
+    &.showOnlyFavicon {
+      padding: 0px;
+      margin: 0px;
+    }
     &:hover {
       background: lighten(@tabsBackground, 5%);
     }
@@ -74,6 +78,10 @@
       display: inline-block;
       margin-right: 4px;
     }
+    &.showOnlyFavicon {
+      padding: 0px;
+      margin: 0px;
+    }
     .bookmarkText {
       text-overflow: ellipsis;
       overflow: hidden;
@@ -83,7 +91,7 @@
       margin-left: 4px;
     }
   }
-
+  
   .bookmarkButton {
     box-sizing: border-box;
     font-size: 14px;