Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
5a54b3b4
Commit
5a54b3b4
authored
Aug 18, 2015
by
Randall Leeds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Button consistency
- Use .btn wherever we use .btn-clean - No border on .btn-clean
parent
03b89e85
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
annotations.scss
h/static/styles/annotations.scss
+3
-0
forms.scss
h/static/styles/forms.scss
+2
-3
annotation.html
h/templates/client/annotation.html
+4
-4
No files found.
h/static/styles/annotations.scss
View file @
5a54b3b4
...
...
@@ -58,6 +58,9 @@
button
{
color
:
$gray-light
;
font-weight
:
normal
;
padding
:
0
.125em
;
.annotation
:hover
&
{
color
:
$link-color
;
}
...
...
h/static/styles/forms.scss
View file @
5a54b3b4
...
...
@@ -235,13 +235,12 @@
}
.btn-clean
{
border
:
none
;
&
,
&
:focus
,
&
:hover
,
&
:active
,
&
[
disabled
],
&
.js-hover
,
&
.js-focus
,
&
.js-active
,
&
.js-disabled
{
@include
box-shadow
(
none
);
padding-left
:
0
;
padding-right
:
0
;
background
:
none
;
border-color
:
transparent
;
}
&
:focus
,
&
:hover
,
&
:active
,
&
.js-hover
,
&
.js-focus
,
&
.js-active
{
...
...
h/templates/client/annotation.html
View file @
5a54b3b4
...
...
@@ -159,12 +159,12 @@
</div>
<div
class=
"annotation-actions"
ng-if=
"!vm.editing && vm.annotation.id"
>
<button
class=
"small btn-clean"
<button
class=
"small btn
btn
-clean"
ng-click=
"vm.reply()"
><i
class=
"h-icon-reply btn-icon"
></i>
<span
class=
"btn-text"
>
Reply
</span></button>
<span
class=
"share-dialog-wrapper"
>
<button
class=
"small btn-clean"
<button
class=
"small btn
btn
-clean"
ng-click=
"share($event)"
><i
class=
"h-icon-link btn-icon"
></i>
<span
class=
"btn-text"
>
Link
</span></button>
...
...
@@ -176,12 +176,12 @@
<input
type=
"text"
value=
"{{vm.annotationURI}}"
readonly
>
</span>
</span>
<button
class=
"small btn-clean"
<button
class=
"small btn
btn
-clean"
ng-show=
"vm.authorize('update')"
ng-click=
"vm.edit()"
><i
class=
"h-icon-edit btn-icon"
></i>
<span
class=
"btn-text"
>
Edit
</span></button>
<button
class=
"small btn-clean"
<button
class=
"small btn
btn
-clean"
ng-show=
"vm.authorize('delete')"
ng-click=
"vm.delete()"
><i
class=
"h-icon-delete btn-icon"
></i>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment