Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bootstrap 5.3 #264

Closed
wants to merge 8 commits into from
Closed

Bootstrap 5.3 #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3ac2ff0
Upgrade to Bootstrap 5 #262
jcdhan1 Nov 25, 2023
65afbc9
Renamed .ml* and .mr-* to .ms-* and .me-*. #262
jcdhan1 Nov 25, 2023
ea435c2
Dropped all .badge-* color classes #262
jcdhan1 Nov 25, 2023
8287894
Removed previously deprecated mixins #262
jcdhan1 Nov 25, 2023
6696fcd
Renamed .close to .btn-close for #262
jcdhan1 Nov 25, 2023
d026b32
Renmed .float-left and .float-right #262
jcdhan1 Nov 25, 2023
1c4efc1
Re-compile with Bootstrap 5.3.2 #262
jcdhan1 Nov 25, 2023
34edac2
Buttons and icons #262
jcdhan1 Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion includes/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ static function renderButtons( $buttons, $options = [] ) {
$wrapperclass = 'dropdown';
}
else {
$wrapperclass = 'btn-group mr-2';
$wrapperclass = 'btn-group me-2';
}
}

Expand Down
4 changes: 2 additions & 2 deletions includes/TweekiTemplate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ public static function renderNavbar($skin) {

<div id="navbar" class="collapse navbar-collapse">
<?php if ( $skin->checkVisibility( 'navbar-left' ) ) { ?>
<ul class="navbar-nav mr-auto">
<ul class="navbar-nav me-auto">
<?php $skin->renderNavbarElement( 'left' ); ?>
</ul>
<?php } ?>
Expand Down Expand Up @@ -1153,7 +1153,7 @@ public function renderLoginExt( $skin, $context ) {
] );
echo '</div>
<div class="form-group">
<button type="submit" name="wpLoginAttempt" tabindex="103" id="wpLoginAttempt2" class="float-right btn btn-primary btn-block">
<button type="submit" name="wpLoginAttempt" tabindex="103" id="wpLoginAttempt2" class="float-end btn btn-primary btn-block">
' . $this->getMsg( 'pt-login-button' )->text() . '
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"production": "mix --production"
},
"devDependencies": {
"bootstrap": "^4.4.1",
"bootstrap": "^5.3.2",
"browser-sync": "^2.27.5",
"browser-sync-webpack-plugin": "^2.3.0",
"jquery": "^3.6.0",
Expand Down
10 changes: 4 additions & 6 deletions public/default/css/tweeki.css
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions resources/styles/tweeki/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,38 @@ body #contentwrapper #maincontentwrapper {
background-color:transparent;
}
}

// Button and icons on page forms
input, button {
&[name=wpPreview], &[name=wpDiff], &[name=add_section] {
@extend .btn-outline-primary;
--bs-btn-bg: unset;
}
}
.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button {
@extend .btn-outline-danger;
--bs-btn-bg: unset;
}

button .oo-ui-iconElement-icon {
// Apply fa styles for icons inside buttons
display: contents;

&:before {
font-family: "Font Awesome 5 Free";
font-weight: $font-weight-bold;
}

&.oo-ui-icon-subtract:before {
content: "\f068"; // fa-minus
}

&.oo-ui-icon-add:before {
content: "\2b"; // fa-plus
}

&+.oo-ui-labelElement-label::before {
content: " ";
}
}
}
8 changes: 1 addition & 7 deletions resources/styles/tweeki/_overwrites.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ label > input[type=radio] {

& > a {
@extend .badge;
@extend .badge-secondary;

position: absolute;
top: $spacer;
Expand Down Expand Up @@ -512,11 +511,6 @@ label > input[type=radio] {
a.mw-selflink {
color: inherit;
text-decoration: none;

@include hover() {
color: inherit;
text-decoration: none;
}
}


Expand All @@ -539,6 +533,6 @@ a.mw-selflink {
margin-bottom:-5px;
}

.close {
.btn-close {
cursor:pointer;
}