Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Added new icons
Browse files Browse the repository at this point in the history
  • Loading branch information
NejcZdovc committed Feb 2, 2017
1 parent b244e67 commit 089cba0
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 31 deletions.
2 changes: 1 addition & 1 deletion img/toolbar/add_BM_folder_btn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion img/toolbar/add_bookmark_btn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions img/toolbar/bookmarks_export.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/toolbar/bookmarks_import.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions js/about/bookmarks.js
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,8 @@ class AboutBookmarks extends React.Component {
<div className='folderView'>
<div className='columnHeader'>
<span data-l10n-id='folders' />
<span data-l10n-id='importBrowserData' className='fa fa-upload importBrowserData' onClick={this.importBrowserData} />
<span data-l10n-id='exportBookmarks' className='fa fa-download exportBookmarks' onClick={this.exportBookmarks} />
<span data-l10n-id='importBrowserData' className='importBrowserData' onClick={this.importBrowserData} />
<span data-l10n-id='exportBookmarks' className='exportBookmarks' onClick={this.exportBookmarks} />
<span data-l10n-id='addBookmarkFolder' className='addBookmarkFolder' onClick={this.addBookmarkFolder} />
</div>
<BookmarkFolderList
Expand Down
57 changes: 30 additions & 27 deletions less/about/bookmarks.less
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,6 @@
padding-left: 10px;
-webkit-user-select: none;
cursor: default;

.importBrowserData,
.exportBookmarks {
color: @buttonColor;
float: right;
font-size: 20px;
margin: 0;

&:hover {
color: #000;
}
}

.exportBookmarks {
margin: 1px 7px 0 0;
}
}

> .bookmarkFolderList {
Expand Down Expand Up @@ -153,27 +137,46 @@
padding-left: 12px;
}

.addBookmarkFolder {
.addBookmarkFolder,
.importBrowserData,
.exportBookmarks,
.addBookmark {
background-color: @buttonColor;
-webkit-mask-image: url('../../img/toolbar/add_BM_folder_btn.svg');
-webkit-mask-repeat: no-repeat;
margin-right: 7px;
width: 24px;
height: 26px;
float: right;
}
.addBookmarkFolder:hover {
background-color: #000;

.addBookmarkFolder {
-webkit-mask-image: url('../../img/toolbar/add_BM_folder_btn.svg');
margin: 0 10px 0 0;
}

.importBrowserData {
-webkit-mask-image: url('../../img/toolbar/bookmarks_import.svg');
width: 31px;
margin: 3px 0 0 0;
}

.exportBookmarks {
-webkit-mask-image: url('../../img/toolbar/bookmarks_export.svg');
width: 26px;
margin: 3px 10px 0 0;
}

.addBookmark {
background-color: @buttonColor;
-webkit-mask-image: url('../../img/toolbar/add_bookmark_btn.svg');
-webkit-mask-repeat: no-repeat;
margin-right: 7px;
width: 20px;
height: 20px;
float: right;
margin-right: 7px;
}
.addBookmark:hover {
background-color: #000;

.addBookmark,
.addBookmarkFolder,
.importBrowserData,
.exportBookmarks {
&:hover {
background-color: #000;
}
}

0 comments on commit 089cba0

Please sign in to comment.