Skip to content
Permalink
Browse files

bootstrap update to version 4.2

  • Loading branch information...
Sundance committed Jan 29, 2019
1 parent 2002548 commit 8ffcc0bc66fc9a0ee3afb55dbbe8a09bb7a72b60
@@ -23,7 +23,7 @@ <h3>Change account email</h3>
<input type="email" class="form-control" id="input-account-new-email" name="new-email" placeholder="New email">
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">Change</button>
<button type="submit" class="btn btn-primary btn-sm">Change</button>
</div>
</form>
{{ template "footer.html" . }}
@@ -24,7 +24,7 @@ <h3>Change account password</h3>
placeholder="New password">
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">Change</button>
<button type="submit" class="btn btn-primary btn-sm">Change</button>
</div>
</form>
{{ template "footer.html" . }}
@@ -20,9 +20,9 @@ <h3>My shop checkouts</h3>
<td>{{ $element.amount }}</td>
<td>
{{ if $element.given }}
<button class="btn btn-success btn-xs">Given</button>
<button class="btn btn-success btn-sm">Given</button>
{{ else }}
<button class="btn btn-danger btn-xs">Waiting</button>
<button class="btn btn-danger btn-sm">Waiting</button>
{{ end }}
</td>
</tr>
@@ -37,7 +37,7 @@ <h3>Create a new character</h3>
</select>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">Create</button>
<button type="submit" class="btn btn-sm btn-primary">Create</button>
</div>
</form>
{{ template "footer.html" . }}
@@ -19,7 +19,7 @@ <h3>Dashboard</h3>
<div class="alert alert-info" role="alert">
<strong>Pending deletion!</strong> The character {{ $character.name }} is pending deletion and will be deleted on {{ $character.deletion.Result }}.
<br>
<button class="btn btn-danger btn-xs" form="form-character-undelete" type="submit" name="undelete-character" value="{{ $character.name }}">Cancel</button>
<button class="btn btn-danger btn-sm" form="form-character-undelete" type="submit" name="undelete-character" value="{{ $character.name }}">Cancel</button>
</div>
{{ end }}
{{ end }}
@@ -34,9 +34,9 @@ <h3>Dashboard</h3>
<th>Two-factor</th>
<td>
{{ if .twofa }}
<button class="btn btn-success btn-xs">Enabled</button>
<button class="btn btn-success btn-sm">Enabled</button>
{{ else }}
<a role="button" href="{{ url "subtopic" "account" "twofa" "enable" }}" class="btn btn-danger btn-xs">Disabled</a>
<a role="button" href="{{ url "subtopic" "account" "twofa" "enable" }}" class="btn btn-danger btn-sm">Disabled</a>
{{ end }}
</td>
</tr>
@@ -72,15 +72,15 @@ <h3>Dashboard</h3>
<tr>
<th></th>
<td>
<a role="button" href="{{ url "subtopic" "account" "changepassword" }}" class="btn btn-xs btn-primary">
<a role="button" href="{{ url "subtopic" "account" "changepassword" }}" class="btn btn-sm btn-primary">
Change password
</a>
</td>
</tr>
<tr>
<th></th>
<td>
<a role="button" href="{{ url "subtopic" "account" "changemail" }}" class="btn btn-xs btn-default">
<a role="button" href="{{ url "subtopic" "account" "changemail" }}" class="btn btn-sm btn-default">
Change email
</a>
</td>
@@ -116,9 +116,9 @@ <h3>My Characters</h3>
<td>{{ $element.level }}</td>
<td>
{{ if eqNumber $element.deletion 0 }}
<button class="btn btn-xs btn-danger require-confirmation" type="submit" form="form-character-delete" name="delete-character" value="{{ $element.name }}">Delete</button>
<button class="btn btn-sm btn-danger require-confirmation" type="submit" form="form-character-delete" name="delete-character" value="{{ $element.name }}">Delete</button>
{{ else }}
<button class="btn btn-xs btn-default" form="form-character-undelete" type="submit" name="undelete-character" value="{{ $element.name }}">Cancel</button>
<button class="btn btn-sm btn-default" form="form-character-undelete" type="submit" name="undelete-character" value="{{ $element.name }}">Cancel</button>
{{ end }}
</td>
</tr>
@@ -28,7 +28,7 @@ <h3>Recover your acocunt name</h3>
</div>
{{ end }}
<div class="form-group">
<button type="submit" class="btn btn-primary">Recover</button>
<button type="submit" class="btn btn-primary btn-sm">Recover</button>
</div>
</form>
{{ template "footer.html" . }}
@@ -28,7 +28,7 @@ <h3>Recover your acocunt password</h3>
</div>
{{ end }}
<div class="form-group">
<button type="submit" class="btn btn-primary">Recover</button>
<button type="submit" class="btn btn-primary btn-sm">Recover</button>
</div>
</form>
{{ template "footer.html" . }}
@@ -21,7 +21,7 @@ <h3>Two-factor authentication</h3>
<input type="text" class="form-control" id="input-token" name="token" placeholder="Authenticator token">
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">Enable</button>
<button type="submit" class="btn btn-primary btn-sm">Enable</button>
</div>
</form>
{{ template "footer.html" . }}
@@ -16,15 +16,19 @@ <h3>Shop</h3>
</p>

{{ if .categories }}
<ul class="nav nav-tabs" role="tablist">
<ul class="nav nav-tabs" id="shopTab" role="tablist">
{{ range $index, $element := .categories }}
<li role="presentation" {{ if eq $index 0 }} class="active" {{ end }}>
<a href="#category-{{ $element.id }}" aria-controls="{{ $element.name }}" role="tab" data-toggle="tab">{{ $element.name }}</a>
<li role="presentation" {{ if eq $index 0 }} class="nav-item" {{ end }}>
{{ if eq $index 0 }}
<a class="nav-link active" href="#category-{{ $element.id }}" aria-controls="{{ $element.name }}" role="tab" data-toggle="tab" aria-selected="true">{{ $element.name }}</a>
{{ else }}
<a class="nav-link" href="#category-{{ $element.id }}" aria-controls="{{ $element.name }}" role="tab" data-toggle="tab" aria-selected="false">{{ $element.name }}</a>
{{ end }}
</li>
{{ end }}
<li role="presentation" class="pull-right">
<a href="#checkout" role="tab" aria-controls="checkout" data-toggle="tab">
<i class="glyphicon glyphicon-shopping-cart"></i> Checkout
<li role="presentation" class="nav-item pull-right">
<a class="nav-link" id="checkout-tab" href="#checkout" role="tab" aria-controls="checkout" data-toggle="tab" aria-selected="false">
<i class="fas fa-shopping-cart"></i> Checkout
</a>
</li>
</ul>
@@ -7,6 +7,53 @@
background-color: #F5F5F5;
}

.navbar-expand-md {
background-color: #333333;
}

.navbar-expand-sm {
height: 58px;
background-color: #333333;
}

.navbar-nav>li>a {
line-height: 35px;
}

.navbar .nav-item {
margin: 0 6px;
}

.navbar .nav-item:hover {
background-color: rgba(0,0,0,.3);
}

.navbar .nav-link {
color: white;
}

.navbar .nav-link:hover {
color: rgba(245,245,245,0.6);
}

.dropdown:hover>.dropdown-menu {
display: block;
}

.dropdown-item {
color: white;
}

.dropdown-item:hover {
background-color: rgba(0,0,0,.3);
color: white;
}

.dropdown-menu {
border-radius: 0;
background-color: #333333;
}

.small-info {
font-size: 12px;
}
@@ -43,12 +90,22 @@
margin-top: 30px;
}

.titleheader h3 {
.titleheader h5 {
font-family: Simonetta;
text-shadow: 2px 2px 2px rgba(0, 0, 0, .5);
color: #fff;
}

.titleheader h1 a {
color: #008cba;
font-family: Simonetta;
}

.titleheader h1 a:hover {
text-decoration: none;
color: rgba(0,140,186,0.7);
}

.col-sm-3.sidebar {
margin-top: 25px;
}
@@ -109,24 +166,18 @@
body {
background-color: black;
background-image: url("/images/bg.png");
font-size: 15px;
line-height: 1.2;
}

#footer {
margin-bottom: 30px;
}

a.title {
text-decoration: none;
}

tr.skills {
text-align: center;
}

.navbar-nav>li>a {
line-height: 35px;
}

.box {
background-color: #EBEBEB;
padding: 29px 20px 15px 15px;
@@ -152,13 +203,20 @@ tr.skills {

}

.panel-body h3 {
.card-body {
padding: 10px;
}

.card-body h3 {
color: #008cba;
}

.panel {
.card {
border: 1px solid #c8c8c8;
box-shadow: 0 1px 5px 0 #c8c8c8;
padding: 10px;
background-color: white;
margin: 8px;
}

.list-widget {
@@ -177,3 +235,23 @@ tr.skills {
margin-bottom: 25px;
margin-top: 25px;
}

.btn {
border-radius: 0;
}

.main-container {
/*font-family: Simonetta;*/
padding-top: 15px;
padding-bottom: 15px;
}

.footer {
color: whitesmoke;
font-size: 14px;
}

.list-group-item {
padding-top: 6px;
padding-bottom: 6px;
}
@@ -1,35 +1,30 @@
</div>
</div>
</div>
<div class="col-sm-3">
{{ widget .widgets "account" }}
{{ widget .widgets "toplevel" }}
{{ widget .widgets "admin" }}
</div>
<div class="clearfix"></div>
</div>


</div>
</div>
</div>
<div class="col">
{{ widget .widgets "account" }}
{{ widget .widgets "toplevel" }}
{{ widget .widgets "admin" }}
</div>
<div class="clearfix"></div>
</div> <!-- row -->
</div> <!-- container-fluid-->
</div> <!-- /container -->

<div class="container" id="footer">
<div class="footer">
<h6>
{{ if isDev }} <b>Development mode</b> |
Page generated in {{ .microtime }} | {{ end }} {{ serverName }} - Engine by <a href="{{ url "subtopic" "credits" }}">Castro</a>
</h6>
{{ if isDev }} <b>Development mode</b> |
Page generated in {{ .microtime }} | {{ end }} {{ serverName }} - Engine by <a href="{{ url "subtopic" "credits" }}">Castro</a>

{{ template "footer" . }}
</div>
</div> <!-- /container -->

<script
src="https://code.jquery.com/jquery-3.1.1.min.js"
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="
crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>

<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>

</script>
<script src="/js/bootstrap.min.js"></script>
<script src="https://cdn.datatables.net/1.10.13/js/jquery.dataTables.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
{{ template "scriptIncludes" . }}
</body>
</html>
Oops, something went wrong.

0 comments on commit 8ffcc0b

Please sign in to comment.
You can’t perform that action at this time.