Skip to content

Commit

Permalink
remove colors select
Browse files Browse the repository at this point in the history
  • Loading branch information
@liquidely
liquidely committed May 1, 2024
1 parent fc9c859 commit d373b04
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 229 deletions.
190 changes: 11 additions & 179 deletions resources/styles/ext.networknotice.Notice.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
padding: 0 0 0 1.5rem;
font-size: 0.875rem;
align-items: center;
background-color: #FFFFFF; // default for Bruinen & LakesideView light theme
background-color: #ffffff; // default for Bruinen & LakesideView light theme
margin-bottom: 0.5rem;

@media (min-width: 768px) {
@media ( min-width: 768px ) {
grid-template-columns: auto 3.75rem;
}

.theme--dark & {
background-color: #26292D;
background-color: #26292d;
}

&::before {
&:before {
content: '';
width: 0.5rem;
top: 0;
Expand All @@ -31,15 +31,15 @@
}

&__content {
border-right: 0.0625rem solid rgba(0, 0, 0, 0.16);
border-right: 0.0625rem solid rgba( 0, 0, 0, 0.16 );
margin: 0.5rem 0;
padding-right: 1rem;
display: flex;
align-items: center;
grid-column: 1;

.theme--dark & {
border-right-color: rgba(255, 255, 255, 0.16);
border-right-color: rgba( 255, 255, 255, 0.16 );
}

&-icon {
Expand All @@ -51,6 +51,10 @@
margin-right: 0.75rem;
font-size: 1.125rem;
opacity: 0.7;

@media ( max-width: 768px ) {
display: none;
}
}
}

Expand All @@ -63,182 +67,10 @@
margin: 0 0.625rem 0 0.375rem;
grid-column: 2;

@media (min-width: 768px) {
@media ( min-width: 768px ) {
width: 2rem;
height: 2rem;
margin: 0 1rem 0 0.75rem;
}
}
}

.networknotice {
margin-top: 0.1875rem;
display: block;
text-align: center;
padding: 0.3125rem 1.5rem 0.3125rem 0.3125rem;
margin-bottom: 0.4375rem;
border-left-width: 0.3125rem;
border-left-style: solid;
position: relative;

a,
a:visited,
a:hover,
a:visited:hover {
color: inherit;
font-weight: bold;
text-decoration: underline;
}

.make-networknotice-skin(
~'default',
var( --network-notice-default-color, #444444 ),
var( --network-notice-default-background-color, #ccccff ),
var( --network-notice-default-border-color, #0000ff )
);

.make-networknotice-skin(
~'inverse',
var( --network-notice-inverse-color, #ffffff ),
var( --network-notice-inverse-background-color, #333333 ),
var( --network-notice-inverse-border-color, #000000 )
);

.make-networknotice(
~'red',
var( --network-notice-red-color, #444444 ),
var( --network-notice-red-background-color, #ffcccc ),
var( --network-notice-red-border-color, #ff0000 )
);

.make-networknotice(
~'green',
var( --network-notice-green-color, #444444 ),
var( --network-notice-green-background-color, #ccffcc ),
var( --network-notice-green-border-color, #00ff00 )
);

.make-networknotice(
~'blue',
var( --network-notice-blue-color, #444444 ),
var( --network-notice-blue-background-color, #ccccff ),
var( --network-notice-blue-border-color, #0000ff )
);

.make-networknotice(
~'lightgrey',
var( --network-notice-lightgrey-color, #444444 ),
var( --network-notice-lightgrey-background-color, #eeeeee ),
var( --network-notice-lightgrey-border-color, #000000 )
);

.make-networknotice(
~'darkgrey',
var( --network-notice-darkgrey-color, #444444 ),
var( --network-notice-darkgrey-background-color, #cccccc ),
var( --network-notice-darkgrey-border-color, #333333 )
);

.make-networknotice(
~'yellow',
var( --network-notice-yellow-color, #444444 ),
var( --network-notice-yellow-background-color, #ffffcc ),
var( --network-notice-yellow-border-color, #ffff00 )
);

.make-networknotice(
~'purple',
var( --network-notice-purple-color, #444444 ),
var( --network-notice-purple-background-color, #ffccff ),
var( --network-notice-purple-border-color, #ff00ff )
);

.make-networknotice(
~'turquoise',
var( --network-notice-turquoise-color, #444444 ),
var( --network-notice-turquoise-background-color, #ccffff ),
var( --network-notice-turquoise-border-color, #00ffff )
);
}

html.theme--light .networknotice {
--network-notice-default-color: var( --clr-wiki-on-primary-container );
--network-notice-default-background-color: var( --clr-wiki-primary-container );
--network-notice-default-border-color: var( --clr-wiki-on-primary-container );
--network-notice-inverse-color: var( --clr-wiki-on-primary );
--network-notice-inverse-background-color: var( --clr-wiki-primary );
--network-notice-inverse-border-color: var( --clr-wiki-on-primary-container );
--network-notice-red-color: var( --clr-semantic-negative-10 );
--network-notice-red-background-color: var( --clr-semantic-negative-90 );
--network-notice-red-border-color: var( --clr-semantic-negative-40 );
--network-notice-green-color: var( --clr-semantic-positive-10 );
--network-notice-green-background-color: var( --clr-semantic-positive-90 );
--network-notice-green-border-color: var( --clr-semantic-positive-40 );
--network-notice-blue-color: var( --clr-sapphire-90 );
--network-notice-blue-background-color: var( --clr-sapphire-10 );
--network-notice-blue-border-color: var( --clr-sapphire-90 );
--network-notice-lightgrey-color: var( --clr-on-surface-variant );
--network-notice-lightgrey-background-color: var( --clr-surface-variant );
--network-notice-lightgrey-border-color: var( --clr-on-surface-variant );
--network-notice-darkgrey-color: var( --clr-surface-variant );
--network-notice-darkgrey-background-color: var( --clr-on-surface-variant );
--network-notice-darkgrey-border-color: var( --clr-surface-variant );
--network-notice-yellow-color: var( --clr-sun-10 );
--network-notice-yellow-background-color: var( --clr-sun-90 );
--network-notice-yellow-border-color: var( --clr-sun-40 );
--network-notice-purple-color: var( --clr-redviolet-10 );
--network-notice-purple-background-color: var( --clr-redviolet-90 );
--network-notice-purple-border-color: var( --clr-redviolet-40 );
--network-notice-turquoise-color: var( --clr-elm-10 );
--network-notice-turquoise-background-color: var( --clr-elm-80 );
--network-notice-turquoise-border-color: var( --clr-elm-40 );
}

html.theme--dark .networknotice {
--network-notice-default-color: #ffffff;
--network-notice-default-background-color: var( --clr-primary-30 );
--network-notice-default-border-color: var( --clr-primary-30 );
--network-notice-inverse-color: var( --clr-primary-10 );
--network-notice-inverse-background-color: var( --clr-primary-80 );
--network-notice-inverse-border-color: var( --clr-primary-80 );
--network-notice-red-color: #ffffff;
--network-notice-red-background-color: var( --clr-semantic-negative-20 );
--network-notice-red-border-color: var( --clr-semantic-negative-20 );
--network-notice-green-color: #ffffff;
--network-notice-green-background-color: var( --clr-semantic-positive-20 );
--network-notice-green-border-color: var( --clr-semantic-positive-20 );
--network-notice-blue-color: #ffffff;
--network-notice-blue-background-color: var( --clr-sapphire-20 );
--network-notice-blue-border-color: var( --clr-sapphire-20 );
--network-notice-lightgrey-color: var( --clr-moon-20 );
--network-notice-lightgrey-background-color: var( --clr-moon-90 );
--network-notice-lightgrey-border-color: var( --clr-moon-90 );
--network-notice-darkgrey-color: #ffffff;
--network-notice-darkgrey-background-color: var( --clr-moon-20 );
--network-notice-darkgrey-border-color: var( --clr-moon-20 );
--network-notice-yellow-color: var( --clr-sun-90 );
--network-notice-yellow-background-color: var( --clr-sun-10 );
--network-notice-yellow-border-color: var( --clr-sun-10 );
--network-notice-purple-color: var( --clr-redviolet-90 );
--network-notice-purple-background-color: var( --clr-redviolet-10 );
--network-notice-purple-border-color: var( --clr-redviolet-10 );
--network-notice-turquoise-color: var( --clr-elm-80 );
--network-notice-turquoise-background-color: var( --clr-elm-10 );
--network-notice-turquoise-border-color: var( --clr-elm-10 );
}

.make-networknotice-skin( @theme, @color, @background, @border ) {
&.networknotice-@{theme} {
color: @color;
background-color: @background;
border-left-color: @border;
}
}

.make-networknotice( @theme, @color, @background, @border ) {
&.networknotice-@{theme} {
color: @color;
background-color: @background;
border-left-color: @border;
}
}
28 changes: 0 additions & 28 deletions src/Colors.php
View file

This file was deleted.

8 changes: 3 additions & 5 deletions src/NoticeHtml.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ class NoticeHtml {
/**
* Generate the Html for out notice
* @param OutputPage $outputPage
* @param string $style
* @param string $text
* @param string $id
* @return string Html for our notice
*/
public static function getNoticeHTML( $outputPage, $style, $text, $id = '0' ) {
public static function getNoticeHTML( $outputPage, $text, $id = '0' ) {
$classes = [
'network-notice',
'network-notice-' . $style,
'network-notice'
];
$attributes = [
'id' => 'network-notice-' . $id,
Expand Down Expand Up @@ -71,7 +69,7 @@ public static function getNoticeHTML( $outputPage, $style, $text, $id = '0' ) {
$element = Html::rawElement(
'div',
$attributes,
$contentDiv . $closeButton // Include the content div and the close button in the content of the network-notice div
$contentDiv . $closeButton
);
return $element;
}
Expand Down
17 changes: 0 additions & 17 deletions src/SpecialPage/SpecialNetworkNotice.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public function execute( $par ) {
$formDefaults[ 'NoticeId' ] = $row->notice_id;
$formDefaults[ 'NoticeLabel' ] = $row->label;
$formDefaults[ 'NoticeText' ] = $row->notice_text;
$formDefaults[ 'NoticeStyle' ] = $row->style;
$formDefaults[ 'NoticeNamespace' ] = $row->namespace;
$formDefaults[ 'NoticeWiki' ] = $row->wiki;
$formDefaults[ 'NoticeCategory' ] = $row->category;
Expand Down Expand Up @@ -105,20 +104,6 @@ public function execute( $par ) {
'required' => true,
'default' => ( $isEdit ? $formDefaults[ 'NoticeText' ] : '' )
];
$formDescriptor[ 'NoticeStyle' ] = [
'type' => 'select',
'label-message' => 'networknotice-create-notice-style-label',
'help-message' => 'networknotice-create-notice-style-helper',
'required' => true,
'options' => ( static function ( $colors ) {
$dropDown = [];
foreach ( $colors as $color ) {
$dropDown[ $color ] = $color;
}
return $dropDown;
} )( Colors::getNoticeColors() ),
'default' => $isEdit ? $formDefaults[ 'NoticeStyle' ] : ''
];
$formDescriptor[ 'NoticeNamespace' ] = [
'type' => 'text',
'label-message' => 'networknotice-create-notice-namespace-label',
Expand Down Expand Up @@ -315,15 +300,13 @@ public function createNetworkNoticeCB( $formData ) {
$output->addHTML(
NoticeHtml::getNoticeHTML(
$output,
$formData[ 'NoticeStyle' ],
$formData[ 'NoticeText' ]
)
);
} else {
$vars = [
'label' => $formData[ 'NoticeLabel' ],
'notice_text' => $formData[ 'NoticeText' ],
'style' => $formData[ 'NoticeStyle' ],
'namespace' => $formData[ 'NoticeNamespace' ],
'wiki' => $formData[ 'NoticeWiki' ],
'category' => $formData[ 'NoticeCategory' ],
Expand Down

0 comments on commit d373b04

Please sign in to comment.