Skip to content

Commit

Permalink
nassh: move chrome-bootstrap to third_party
Browse files Browse the repository at this point in the history
We didn't author this code, so move it out to third_party/.

Change-Id: Icc3ba0b406761256130a1e645263574f67e03c3f
Reviewed-on: https://chromium-review.googlesource.com/c/1476662
Reviewed-by: Vitaliy Shipitsyn <[email protected]>
Tested-by: Mike Frysinger <[email protected]>
  • Loading branch information
vapier committed Feb 22, 2019
1 parent fad4310 commit 37c3412
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 3 deletions.
6 changes: 4 additions & 2 deletions nassh/doc/hack.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ The vast majority of the code here lives under [js/].
* [bin/]: Tools for building/testing this extension.
* concat/: Compiled output of other projects we use.
* [css/]: Any CSS needed for styling UI.
* [chrome-bootstrap.css]: Theme code for the extensions options page.
* [nassh_box.css]: Common utility styling code.
* [nassh_connect_dialog.css]: Styling for the connection dialog.
* [nassh_preferences_editor.css]: Styling for the extensions options page.
Expand All @@ -264,6 +263,8 @@ The vast majority of the code here lives under [js/].
* See the section below.
* [_locales/]: [Translations](https://developer.chrome.com/extensions/i18n) of strings shown to the user.
* plugin/: Compiled NaCl & output from [ssh_client]
* [third_party/]: Various 3rd party code we import.
* [chrome-bootstrap.css]: Theme code for the extensions options page.
* [manifest_ext.json]: The Chrome manifest for the extension.
* [manifest_v1.5.json]: The Chrome manifest for the "v1.5" app.
* [manifest_v2.json]: The Chrome manifest for the "v2" app.
Expand Down Expand Up @@ -541,13 +542,14 @@ Here's a random list of documents which would be useful to people.
[images/]: ../images/
[js/]: ../js/
[_locales/]: ../_locales/
[third_party/]: ../third_party/

[manifest_ext.json]: ../manifest_ext.json
[manifest_v1.5.json]: ../manifest_v1.5.json
[manifest_v2.json]: ../manifest_v2.json
[manifest_crosh.json]: https://cs.chromium.org/chromium/src/chrome/browser/resources/chromeos/crosh_builtin/manifest.json

[chrome-bootstrap.css]: ../css/chrome-bootstrap.css
[chrome-bootstrap.css]: ../third_party/chrome-bootstrap/chrome-bootstrap.css
[nassh_box.css]: ../css/nassh_box.css
[nassh_connect_dialog.css]: ../css/nassh_connect_dialog.css
[nassh_preferences_editor.css]: ../css/nassh_preferences_editor.css
Expand Down
2 changes: 1 addition & 1 deletion nassh/html/nassh_preferences_editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script src='../js/nassh_preference_manager.js'></script>
<script src='../js/nassh_preferences_editor.js'></script>

<link rel='stylesheet' href='../css/chrome-bootstrap.css'></link>
<link rel='stylesheet' href='../third_party/chrome-bootstrap/chrome-bootstrap.css'></link>
<link rel='stylesheet' href='../css/nassh_preferences_editor.css'></link>
</head>

Expand Down
21 changes: 21 additions & 0 deletions nassh/third_party/chrome-bootstrap/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License

Copyright (c) 2012 Chrome Bootstrap authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
15 changes: 15 additions & 0 deletions nassh/third_party/chrome-bootstrap/METADATA
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: "Chrome UI bootstrap"
description: "Chrome's UI stylings recreated for easy reuse"

third_party {
url {
type: HOMEPAGE
value: "https://www.npmjs.com/package/chrome-bootstrap"
}
url {
type: GIT
value: "https://github.com/better-history/chrome-bootstrap"
}
version: "1.2.1"
last_upgrade_date { year: 2013 month: 12 day: 9 }
}
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@
.chrome-bootstrap select:focus,
.chrome-bootstrap input[type='checkbox']:focus,
.chrome-bootstrap input[type='password']:focus,
.chrome-bootstrap input[type='range']:focus,
.chrome-bootstrap input[type='radio']:focus,
.chrome-bootstrap input[type='search']:focus,
.chrome-bootstrap input[type='text']:focus,
Expand Down

0 comments on commit 37c3412

Please sign in to comment.