diff --git a/src/components/modals/main/scss/modules/_tab-content.scss b/src/components/modals/main/scss/modules/_tab-content.scss index 5eb38aa1..a6ef4410 100644 --- a/src/components/modals/main/scss/modules/_tab-content.scss +++ b/src/components/modals/main/scss/modules/_tab-content.scss @@ -25,6 +25,7 @@ align-items: center; min-height: 100px; justify-content: space-between; + transition: 0.4s ease-in-out; /* border-top: 1px solid #ccc; */ border-bottom: 1px solid #676767; diff --git a/src/components/modals/main/settings/SettingsItem.jsx b/src/components/modals/main/settings/SettingsItem.jsx index b93a1540..fa1b583e 100644 --- a/src/components/modals/main/settings/SettingsItem.jsx +++ b/src/components/modals/main/settings/SettingsItem.jsx @@ -1,9 +1,6 @@ function Row(props) { - return ( -
- {props.children} -
- ); + const classes = `${props.final ? 'settingsRow settingsNoBorder' : 'settingsRow'} ${props.inactive ? 'preferencesInactive' : ''}`; + return
{props.children}
; } function Content(props) { diff --git a/src/components/modals/main/settings/sections/Navbar.jsx b/src/components/modals/main/settings/sections/Navbar.jsx index 526f052d..bc3ee377 100644 --- a/src/components/modals/main/settings/sections/Navbar.jsx +++ b/src/components/modals/main/settings/sections/Navbar.jsx @@ -14,11 +14,13 @@ import { Row, Content, Action } from '../SettingsItem'; import Header from '../Header'; import { getTitleFromUrl, isValidUrl } from 'modules/helpers/settings/modals'; import QuickLink from './quicklinks/QuickLink'; +import Apps from '../../../../widgets/navbar/Apps'; function Navbar() { const [showRefreshOptions, setShowRefreshOptions] = useState( localStorage.getItem('refresh') === 'true', ); + const [appsEnabled, setAppsEnabled] = useState(localStorage.getItem('appsEnabled') === 'true'); const [appsModalInfo, setAppsModalInfo] = useState({ newLink: false, edit: false, @@ -112,15 +114,8 @@ function Navbar() { const NAVBAR_SECTION = 'modals.main.settings.sections.appearance.navbar'; - return ( - <> -
+ const AdditionalSettings = () => { + return ( - {showRefreshOptions && ( - - - - - - - - - - - - )} + ); + }; - + const RefreshOptions = () => { + return ( + + + + + + + + + + + + ); + }; + + const AppsOptions = () => { + return ( + + ); + }; + + return ( + <> +
+ + +
{appsModalInfo.items.map((item, i) => ( diff --git a/src/components/widgets/background/PhotoInformation.jsx b/src/components/widgets/background/PhotoInformation.jsx index 6370e989..622a4188 100644 --- a/src/components/widgets/background/PhotoInformation.jsx +++ b/src/components/widgets/background/PhotoInformation.jsx @@ -278,10 +278,10 @@ function PhotoInformation({ info, url, api }) { {showExtraInfo || other ? ( <> + + {variables.getMessage('widgets.background.information')} +
- - {variables.getMessage('widgets.background.information')} - {info.location && info.location !== 'N/A' ? (
diff --git a/src/components/widgets/background/scss/_photoinformation.scss b/src/components/widgets/background/scss/_photoinformation.scss index 8449c0bb..75eedb59 100644 --- a/src/components/widgets/background/scss/_photoinformation.scss +++ b/src/components/widgets/background/scss/_photoinformation.scss @@ -19,8 +19,9 @@ } .extra-content { - display: flex; - flex-flow: column; + margin-top: 10px; + display: grid; + grid-template-columns: auto auto; gap: 10px; transition: 0.8s; }