Skip to content

Commit

Permalink
Ticket #3398 - Get rid of empty main.css files and redundant referenc…
Browse files Browse the repository at this point in the history
…es to main.css files from base modules.
  • Loading branch information
AntonLV committed Sep 17, 2021
1 parent c1c56bd commit 17e002a
Show file tree
Hide file tree
Showing 29 changed files with 18 additions and 67 deletions.
24 changes: 18 additions & 6 deletions inc/classes/BxDolModuleTemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,34 @@ public function addLocationBase() {}

function addCssSystem($mixedFiles, $bDynamic = false)
{
$sResult = '';
$bResult = false;

foreach($this->getLocations() as $sKey => $aLocation)
$bResult |= $this->_addFiles(BxDolTemplate::getInstance(), 'addCssSystem', 'isLocation', 'addLocation', 'removeLocation', '', $mixedFiles, $bDynamic, true, [$sKey => $aLocation]);
foreach($this->getLocations() as $sKey => $aLocation) {
$mixedResult = $this->_addFiles(BxDolTemplate::getInstance(), 'addCssSystem', 'isLocation', 'addLocation', 'removeLocation', '', $mixedFiles, $bDynamic, true, [$sKey => $aLocation]);
if($bDynamic)
$sResult .= $mixedResult;
else
$bResult |= $mixedResult;
}

return $bResult;
return $bDynamic ? $sResult : $bResult;
}

function addCss($mixedFiles, $bDynamic = false)
{
$sResult = '';
$bResult = false;

foreach($this->getLocations() as $sKey => $aLocation)
$bResult |= $this->_addFiles(BxDolTemplate::getInstance(), 'addCss', 'isLocation', 'addLocation', 'removeLocation', '', $mixedFiles, $bDynamic, true, [$sKey => $aLocation]);
foreach($this->getLocations() as $sKey => $aLocation) {
$mixedResult = $this->_addFiles(BxDolTemplate::getInstance(), 'addCss', 'isLocation', 'addLocation', 'removeLocation', '', $mixedFiles, $bDynamic, true, [$sKey => $aLocation]);
if($bDynamic)
$sResult .= $mixedResult;
else
$bResult |= $mixedResult;
}

return $bResult;
return $bDynamic ? $sResult : $bResult;
}

function addJsSystem($mixedFiles, $bDynamic = false)
Expand Down
2 changes: 0 additions & 2 deletions modules/base/groups/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(../../../../base/profile/template/css/main.css);

.bx-base-group-cover-wrapper .bx-base-pofile-cover-info .bx-def-ava {
border-width:0.0625rem;
border-radius:0.1875rem;
Expand Down
3 changes: 0 additions & 3 deletions modules/base/profile/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@import url(../../../general/template/css/main.css);

/* browse unit */

.bx-base-pofile-unit {
width:184px;
width:11.5rem;
Expand Down
2 changes: 0 additions & 2 deletions modules/base/text/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(../../../general/template/css/main.css);

/* unit */
.bx-base-text-unit h2,
.bx-base-text-unit h1 {
Expand Down
2 changes: 0 additions & 2 deletions modules/boonex/ads/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(../../../../base/text/template/css/main.css);

/*--- Categories ---*/
.bx-ads-subcategories .bx-ads-category:first-child {
padding-top: 0;
Expand Down
4 changes: 0 additions & 4 deletions modules/boonex/albums/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@

@import url(../../../../base/text/template/css/main.css);


/* flexbox */
.bx-albums-medias-wrapper {
display: -webkit-box;
Expand Down
1 change: 0 additions & 1 deletion modules/boonex/channels/template/css/main.css

This file was deleted.

2 changes: 0 additions & 2 deletions modules/boonex/classes/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(../../../../base/text/template/css/main.css);

.bx-course-controls-1 {
float:left;
}
Expand Down
3 changes: 0 additions & 3 deletions modules/boonex/convos/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@

@import url(../../../../base/text/template/css/main.css);

.bx-cnv-collaborators {
white-space:nowrap;
}
Expand Down
2 changes: 0 additions & 2 deletions modules/boonex/courses/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(../../../../base/groups/template/css/main.css);

/*-- Cource Roles --*/
#bx-courses-set-role-popup .bx-menu-ver {
margin: 0;
Expand Down
2 changes: 0 additions & 2 deletions modules/boonex/credits/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(../../../../base/general/template/css/main.css);

.sys-icon.bx-credits-prefix-icon {
color: #334455;
}
Expand Down
3 changes: 0 additions & 3 deletions modules/boonex/events/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import url(../../../../base/groups/template/css/main.css);


/*-- Event Roles --*/
#bx-events-set-role-popup .bx-menu-ver {
margin: 0;
Expand Down
1 change: 0 additions & 1 deletion modules/boonex/feedback/template/css/main.css

This file was deleted.

2 changes: 0 additions & 2 deletions modules/boonex/files/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(../../../../base/text/template/css/main.css);

.bx-files-text-unit-gallery .bx-base-text-unit-no-thumb {
position:relative;
}
Expand Down
3 changes: 0 additions & 3 deletions modules/boonex/forum/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@import url(../../../../base/text/template/css/main.css);

/*-- Participants --*/

.bx-forum-participant {
position:relative;
display:block;
Expand Down
1 change: 0 additions & 1 deletion modules/boonex/glossary/template/css/main.css

This file was deleted.

1 change: 0 additions & 1 deletion modules/boonex/groups/template/css/main.css

This file was deleted.

3 changes: 0 additions & 3 deletions modules/boonex/market/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@

@import url(../../../../base/text/template/css/main.css);

/*--- Snippet ---*/
div.bx-market-unit-gallery-cnt {
position: relative;
Expand Down
3 changes: 0 additions & 3 deletions modules/boonex/organizations/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import url(../../../../base/profile/template/css/main.css);


/*-- Group Roles --*/
#bx-organizations-set-role-popup .bx-menu-ver {
margin: 0;
Expand Down
1 change: 0 additions & 1 deletion modules/boonex/persons/template/css/main.css

This file was deleted.

3 changes: 0 additions & 3 deletions modules/boonex/photos/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import url(../../../../base/text/template/css/main.css);


/*--- Photo Block ---*/
.bx-photos-entity-photo img {
max-width:100%;
Expand Down
3 changes: 0 additions & 3 deletions modules/boonex/polls/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import url(../../../../base/text/template/css/main.css);


/*--- Unit embed ---*/
.bx-polls-embed {
width: 100%;
Expand Down
1 change: 0 additions & 1 deletion modules/boonex/posts/template/css/main.css

This file was deleted.

2 changes: 0 additions & 2 deletions modules/boonex/reviews/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(../../../../base/text/template/css/main.css);

.bx-review-vertical-flex {
display: flex;
flex-direction: column;
Expand Down
2 changes: 0 additions & 2 deletions modules/boonex/shopify/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(../../../../base/text/template/css/main.css);

/*--- Cover ---*/
.bx_shopify_cover .bx-cover-actions .bx-menu-btns-hor,
.bx_shopify_cover .bx-cover-actions .bx-btn.bx-shopify-buy {
Expand Down
3 changes: 0 additions & 3 deletions modules/boonex/snipcart/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import url(../../../../base/text/template/css/main.css);


.bx_snipcart_cover .bx-cover-actions .bx-menu-btns-hor,
.bx_snipcart_cover .bx-cover-actions .bx-btn.snipcart-add-item {
display: inline-block;
Expand Down
3 changes: 0 additions & 3 deletions modules/boonex/spaces/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import url(../../../../base/groups/template/css/main.css);


/*-- Space Roles --*/
#bx-spaces-set-role-popup .bx-menu-ver {
margin: 0;
Expand Down
1 change: 0 additions & 1 deletion modules/boonex/tasks/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import url(../../../../base/text/template/css/main.css);
.bx-tasks-tasklist .bx-def-color-bg-hl{
display: flex;
flex-wrap: wrap;
Expand Down
2 changes: 0 additions & 2 deletions modules/boonex/videos/template/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import url(../../../../base/text/template/css/main.css);

/*--- Video Block ---*/
.bx-videos-entity-video img,
.bx-videos-entity-video video {
Expand Down

0 comments on commit 17e002a

Please sign in to comment.