308. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:07 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

308.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_actions-toolbar.less2015-10-06 16:52:16 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_actions-toolbar.less2015-10-06 16:52:16 +0000

308.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1146
Changed00
Inserted00
Removed00

308.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

308.4 Active regular expressions

No regular expressions were active.

308.5 Comparison detail

1 // /** 1 // /**
2 //  * Copyright © 2015 Magento. All rights reserved. 2 //  * Copyright © 2015 Magento. All rights reserved.
3 //  * See COPYING.txt for license details. 3 //  * See COPYING.txt for license details.
4 //  */ 4 //  */
5  5 
6 // 6 //
7 //    Common 7 //    Common
8 //-------------------------------------- 8 //--------------------------------------
9  9 
10 & when (@media-common = true) { 10 & when (@media-common = true) {
11  11 
12 .actions-toolbar { 12 .actions-toolbar {
13     > .primary, 13     > .primary,
14     > .secondary { 14     > .secondary {
15         text-align: center; 15         text-align: center;
16         .action { 16         .action {
17             &:extend(.abs-button-responsive all); 17             &:extend(.abs-button-responsive all);
18             margin-bottom: @indent__s; 18             margin-bottom: @indent__s;
19             &:last-child { 19             &:last-child {
20                 margin-bottom: 0; 20                 margin-bottom: 0;
21             } 21             }
22             &.primary { 22             &.primary {
23                 //&:extend(.abs-button-l all); 23                 //&:extend(.abs-button-l all);
24             } 24             }
25         } 25         }
26         margin-bottom: @indent__s; 26         margin-bottom: @indent__s;
27         &:last-child { 27         &:last-child {
28             margin-bottom: 0; 28             margin-bottom: 0;
29         } 29         }
30     } 30     }
31     > .secondary { 31     > .secondary {
32         .action.back { 32         .action.back {
33             display: none; 33             display: none;
34         } 34         }
35     } 35     }
36 } 36 }
37  37 
38 .sidebar .actions-toolbar { 38 .sidebar .actions-toolbar {
39     .action.primary { 39     .action.primary {
40         height: 32px; 40         height: 32px;
41         line-height: 30px; 41         line-height: 30px;
42         padding: 0 15px; 42         padding: 0 15px;
43     } 43     }
44     .secondary a.action { 44     .secondary a.action {
45         line-height: 32px; 45         line-height: 32px;
46         margin: 0; 46         margin: 0;
47     } 47     }
48 } 48 }
49 } 49 }
50  50 
51 // 51 //
52 //    Desktop 52 //    Desktop
53 //-------------------------------------- 53 //--------------------------------------
54 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 54 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
55     .actions-toolbar { 55     .actions-toolbar {
56         .lib-actions-toolbar(); 56         .lib-actions-toolbar();
57         > .primary, 57         > .primary,
58         > .secondary { 58         > .secondary {
59             margin-bottom: 0; 59             margin-bottom: 0;
60             .action { 60             .action {
61                 width: auto; 61                 width: auto;
62                 margin-bottom: 0; 62                 margin-bottom: 0;
63             } 63             }
64         } 64         }
65     } 65     }
66     form { 66     form {
67         .actions-toolbar { 67         .actions-toolbar {
68             .column:not(.sidebar-main) &, 68             .column:not(.sidebar-main) &,
69             .column:not(.sidebar-additional) & { 69             .column:not(.sidebar-additional) & {
70             } 70             }
71         } 71         }
72     } 72     }
73 } 73 }