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

Commit

Permalink
Merge pull request #9368 from brave/0.16.7
Browse files Browse the repository at this point in the history
0.16.7, update muon to 4.0.2
  • Loading branch information
bsclifton authored Jun 9, 2017
2 parents 51de9af + 7ea7def commit 4a7ff58
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
runtime = electron
target_arch = x64
brave_electron_version = 4.0.1
brave_electron_version = 4.0.2
chromedriver_version = 2.29
target = v4.0.1
target = v4.0.2
disturl=https://brave-laptop-binaries.s3.amazonaws.com/atom-shell/dist/
build_from_source = true
5 changes: 4 additions & 1 deletion less/about/bookmarks.less
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@
flex-grow: 5;
border-left: 1px solid @braveOrange;
overflow: auto;
max-height: 100vh;
// viewport - header size
// TODO: once table header is fixed,
// add table header (35px) size
max-height: calc(~"100vh - 84px");

.sortableTable {
user-select: none;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "brave",
"version": "0.16.6",
"version": "0.16.7",
"description": "Brave laptop and desktop browser",
"main": "./app/index.js",
"config": {
Expand Down
2 changes: 1 addition & 1 deletion tools/cibuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import subprocess
import sys
import os.path
MUON_VERSION = '4.0.1'
MUON_VERSION = '4.0.2'
CHROMEDRIVER_VERSION = '2.29'
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
TARGET_ARCH= os.environ['TARGET_ARCH'] if os.environ.has_key('TARGET_ARCH') else 'x64'
Expand Down

0 comments on commit 4a7ff58

Please sign in to comment.