Skip to content

Commit 5e27280

Browse files
mortezamorteza
committed
Fix #48, colored left and right borders for input-groups with add-ons.
1 parent f88a143 commit 5e27280

File tree

7 files changed

+87
-12
lines changed

7 files changed

+87
-12
lines changed

‎bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "bootstrap-rtl",
33
"description": "Right-to-left (RTL) theme for Twitter Bootstrap 3.x",
4-
"version": "3.3.1-rc1",
4+
"version": "3.3.1-rc2",
55
"homepage": "https://github.com/morteza/bootstrap-rtl",
66
"authors": [
7-
"Morteza Ansarinia <ansarinia@me.com>"
7+
"Morteza Ansarinia (http://github.com/morteza)"
88
],
99
"main": [
1010
"dist/css/bootstrap-rtl.css"
@@ -18,7 +18,7 @@
1818
"docs",
1919
"js/tests"
2020
],
21-
"license": "Unlicense",
21+
"license": "Unlicensed Public Domain",
2222
"dependencies": {
2323
"jquery": ">= 1.9.1"
2424
}

‎dist/css/bootstrap-rtl.css

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap-rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/bootstrap-rtl.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/rtl/input-groups.html

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<meta name="description" content="">
8+
<meta name="author" content="">
9+
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
10+
11+
<title>Navbar Template for Bootstrap RTL</title>
12+
13+
<!-- Bootstrap core CSS -->
14+
<link href="../../bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
15+
<!-- Bootstrap RTL theme -->
16+
<link href="../../dist/css/bootstrap-rtl.min.css" rel="stylesheet">
17+
18+
</head>
19+
20+
<body role="document">
21+
22+
<div class="container">
23+
24+
<div class="form-group has-success">
25+
<label class="control-label" for="inputSuccess1">Input with success</label>
26+
<input type="text" class="form-control" id="inputSuccess1">
27+
</div>
28+
<div class="form-group has-warning">
29+
<label class="control-label" for="inputWarning1">Input with warning</label>
30+
<input type="text" class="form-control" id="inputWarning1">
31+
</div>
32+
<div class="input-group has-error">
33+
<span class="input-group-addon" id="basic-addon1">@</span>
34+
<input type="text" class="form-control" id="inputError1">
35+
</div>
36+
<div class="has-success">
37+
<div class="checkbox">
38+
<label>
39+
<input type="checkbox" id="checkboxSuccess" value="option1">
40+
Checkbox with success
41+
</label>
42+
</div>
43+
</div>
44+
<div class="has-warning">
45+
<div class="checkbox">
46+
<label>
47+
<input type="checkbox" id="checkboxWarning" value="option1">
48+
Checkbox with warning
49+
</label>
50+
</div>
51+
</div>
52+
<div class="has-error">
53+
<div class="checkbox">
54+
<label>
55+
<input type="checkbox" id="checkboxError" value="option1">
56+
Checkbox with error
57+
</label>
58+
</div>
59+
</div>
60+
61+
</div>
62+
<!-- Bootstrap core JavaScript
63+
================================================== -->
64+
<!-- Placed at the end of the document so the pages load faster -->
65+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
66+
<script src="../../bootstrap/dist/js/bootstrap.min.js"></script>
67+
<script type="text/javascript">
68+
$('button').popover();
69+
</script>
70+
</body>
71+
</html>

‎less/input-groups-rtl.less

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
.border-left-radius(0);
2626
}
2727
.input-group-addon:first-child {
28-
border-right: 1px solid @input-group-addon-border-color;
28+
border-right-width: 1px;
29+
border-right-style: solid;
2930
border-left: 0px;
3031
}
3132
.input-group .form-control:last-child,
@@ -39,7 +40,8 @@
3940
.border-right-radius(0);
4041
}
4142
.input-group-addon:last-child {
42-
border-left: 1px solid @input-group-addon-border-color;
43+
border-left-width: 1px;
44+
border-left-style: solid;
4345
border-right: 0px;
4446
}
4547

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
"url": "https://github.com/morteza/bootstrap-rtl/issues"
3333
},
3434
"licenses": [{
35-
"type": "Unlicense"
35+
"type": "Unlicensed Public Domain"
3636
}]
3737
}

0 commit comments

Comments
 (0)